PPB_FLASH_DEVICEID_INTERFACE_1_0 requires PERMISSION_FLASH.

This CL reverts r215423 and r230644. TBR=isherman@chromium.org,teravest@chromium.org Review URL: https://codereview.chromium.org/193753002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256393 0039d316-1c4b-4281-b951-d872f2087c98
marcosholgado · Mar 12, 2014 · 1fd1909 · 1fd1909
1 parent 8dba9ea
commit 1fd1909
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 16 deletions.
diff --git a/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.cc b/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.cc
@@ -110,18 +110,6 @@ scoped_ptr<ResourceHost> ChromeBrowserPepperHostFactory::CreateResourceHost(
             host_->GetPpapiHost(), instance, params.pp_resource(),
             clipboard_filter));
       }
-    }
-  }
-
-  // PepperFlashDRMHost is also used by the PPB_Flash_DeviceID interface
-  // which has private permission.
-  // TODO(xhwang): Once PPB_Flash_DeviceID is removed, remove the check
-  // for private permissions.
-  if (host_->GetPpapiHost()->permissions().HasPermission(
-          ppapi::PERMISSION_FLASH) ||
-      host_->GetPpapiHost()->permissions().HasPermission(
-          ppapi::PERMISSION_PRIVATE)) {
-    switch (message.type()) {
       case PpapiHostMsg_FlashDRM_Create::ID:
         return scoped_ptr<ResourceHost>(new PepperFlashDRMHost(
             host_, instance, params.pp_resource()));

diff --git a/ppapi/thunk/interfaces_ppb_private.h b/ppapi/thunk/interfaces_ppb_private.h
@@ -33,9 +33,6 @@ PROXIED_IFACE(PPB_FILECHOOSER_TRUSTED_INTERFACE_0_6,
               PPB_FileChooserTrusted_0_6)
 PROXIED_IFACE(PPB_FILEREFPRIVATE_INTERFACE_0_1,
               PPB_FileRefPrivate_0_1)
-// TODO(xhwang): Move PPB_Flash_DeviceID back to interfaces_ppb_private_flash.h.
-PROXIED_IFACE(PPB_FLASH_DEVICEID_INTERFACE_1_0,
-              PPB_Flash_DeviceID_1_0)
 PROXIED_IFACE(PPB_FLASHFULLSCREEN_INTERFACE_0_1,
               PPB_FlashFullscreen_0_1)
 PROXIED_IFACE(PPB_FLASHFULLSCREEN_INTERFACE_1_0,

diff --git a/ppapi/thunk/interfaces_ppb_private_flash.h b/ppapi/thunk/interfaces_ppb_private_flash.h
@@ -28,6 +28,8 @@ PROXIED_IFACE(PPB_FLASH_CLIPBOARD_INTERFACE_5_0,
 PROXIED_IFACE(PPB_FLASH_CLIPBOARD_INTERFACE_5_1,
               PPB_Flash_Clipboard_5_1)
 
+PROXIED_IFACE(PPB_FLASH_DEVICEID_INTERFACE_1_0,
+              PPB_Flash_DeviceID_1_0)
 PROXIED_IFACE(PPB_FLASH_DRM_INTERFACE_1_0,
               PPB_Flash_DRM_1_0)
 

diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
@@ -32180,7 +32180,7 @@ other types of suffix sets.
 </enum>
 
 <enum name="PepperInterface" type="int">
-<!-- Generated by src/ppapi/tools/pepper_hash_for_uma.cc -->
+<!-- Generated by ppapi/tools/pepper_hash_for_uma.cc -->
 
   <int value="286711" label="PPB_FlashFullscreen;0.1"/>
   <int value="2804066" label="PPB_AudioConfig;1.1"/>