Merge branch 'googledrive' of github.com:remitamine/youtube-dl into remitamine-google...

diff --cc youtube_dl/extractor/__init__.py
index 908581bf7448a8e44ccb6e04bbda0ab85c02b32a,6655d7eb5466b2a0a972e533c1531ad976dc1160..e7b536df03ef25c7dfbf2bc63264928016c07543
--- 1/youtube_dl/extractor/__init__.py
--- 2/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -231,10 -209,11 +231,11 @@@ from .globo import 
  from .godtube import GodTubeIE
  from .goldenmoustache import GoldenMoustacheIE
  from .golem import GolemIE
+ from .googledrive import GoogleDriveIE
  from .googleplus import GooglePlusIE
  from .googlesearch import GoogleSearchIE
 -from .gorillavid import GorillaVidIE
  from .goshgay import GoshgayIE
 +from .gputechconf import GPUTechConfIE
  from .groupon import GrouponIE
  from .hark import HarkIE
  from .hearthisat import HearThisAtIE

diff --cc youtube_dl/extractor/generic.py
index c2e8f9b62d846f2fcd5af61097a3e698cdbe53dc,abd98e500d621c19cbb9928a35a04d5fdf40e327..7cf13fddfe37fa1bf2d2e6329c060f9d4c6286f7
--- 1/youtube_dl/extractor/generic.py
--- 2/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@@ -52,9 -48,7 +52,10 @@@ from .vimeo import VimeoI
  from .dailymotion import DailymotionCloudIE
  from .onionstudios import OnionStudiosIE
  from .snagfilms import SnagFilmsEmbedIE
 +from .screenwavemedia import ScreenwaveMediaIE
 +from .mtv import MTVServicesEmbeddedIE
 +from .pladform import PladformIE
+ from .googledrive import GoogleDriveIE
  
  
  class GenericIE(InfoExtractor):
@@@ -1769,9 -1600,14 +1770,14 @@@
          if nbc_sports_url:
              return self.url_result(nbc_sports_url, 'NBCSportsVPlayer')
  
+         # Look for Google Drive embeds
+         google_drive_url = GoogleDriveIE._extract_url(webpage)
+         if google_drive_url:
+             return self.url_result(google_drive_url, 'GoogleDrive')
+ 
          # Look for UDN embeds
          mobj = re.search(
 -            r'<iframe[^>]+src="(?P<url>%s)"' % UDNEmbedIE._VALID_URL, webpage)
 +            r'<iframe[^>]+src="(?P<url>%s)"' % UDNEmbedIE._PROTOCOL_RELATIVE_VALID_URL, webpage)
          if mobj is not None:
              return self.url_result(
                  compat_urlparse.urljoin(url, mobj.group('url')), 'UDNEmbed')