Refactored PPB_Flash GetSettings to the new pepper resource model

This also removes unnecessary code from the PluginDelegate and PepperMessageFilter.


BUG=


Review URL: https://chromiumcodereview.appspot.com/11413200

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173850 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 0 insertions, 31 deletions

diff --git a/webkit/plugins/ppapi/mock_plugin_delegate.cc b/webkit/plugins/ppapi/mock_plugin_delegate.cc
index 8339ac4..3167613 100644
--- a/webkit/plugins/ppapi/mock_plugin_delegate.cc
+++ b/webkit/plugins/ppapi/mock_plugin_delegate.cc
@@ -419,11 +419,5 @@ int MockPluginDelegate::EnumerateDevices(
 void MockPluginDelegate::StopEnumerateDevices(int request_id) {
 }
 
-PP_FlashLSORestrictions MockPluginDelegate::GetLocalDataRestrictions(
-    const GURL& document_url,
-    const GURL& plugin_url) {
-  return PP_FLASHLSORESTRICTIONS_NONE;
-}
-
 }  // namespace ppapi
 }  // namespace webkit
diff --git a/webkit/plugins/ppapi/mock_plugin_delegate.h b/webkit/plugins/ppapi/mock_plugin_delegate.h
index fdd8bf2..aa730f9 100644
--- a/webkit/plugins/ppapi/mock_plugin_delegate.h
+++ b/webkit/plugins/ppapi/mock_plugin_delegate.h
@@ -184,9 +184,6 @@ class MockPluginDelegate : public PluginDelegate {
   virtual int EnumerateDevices(PP_DeviceType_Dev type,
                                const EnumerateDevicesCallback& callback);
   virtual void StopEnumerateDevices(int request_id);
-  virtual PP_FlashLSORestrictions GetLocalDataRestrictions(
-      const GURL& document_url,
-      const GURL& plugin_url);
 };
 
 }  // namespace ppapi
diff --git a/webkit/plugins/ppapi/plugin_delegate.h b/webkit/plugins/ppapi/plugin_delegate.h
index b228cf3..665c802 100644
--- a/webkit/plugins/ppapi/plugin_delegate.h
+++ b/webkit/plugins/ppapi/plugin_delegate.h
@@ -671,11 +671,6 @@ class PluginDelegate {
   // Stop enumerating devices of the specified |request_id|. The |request_id|
   // is the return value of EnumerateDevicesCallback.
   virtual void StopEnumerateDevices(int request_id) = 0;
-
-  // Returns restrictions on local data handled by the plug-in.
-  virtual PP_FlashLSORestrictions GetLocalDataRestrictions(
-      const GURL& document_url,
-      const GURL& plugin_url) = 0;
 };
 
 }  // namespace ppapi
diff --git a/webkit/plugins/ppapi/ppb_flash_impl.cc b/webkit/plugins/ppapi/ppb_flash_impl.cc
index 43e9ba2..12ae10a 100644
--- a/webkit/plugins/ppapi/ppb_flash_impl.cc
+++ b/webkit/plugins/ppapi/ppb_flash_impl.cc
@@ -175,20 +175,5 @@ PP_Bool PPB_Flash_Impl::IsRectTopmost(PP_Instance instance,
                 rect->size.width, rect->size.height)));
 }
 
-PP_Var PPB_Flash_Impl::GetSetting(PP_Instance instance,
-                                  PP_FlashSetting setting) {
-  switch(setting) {
-    case PP_FLASHSETTING_LSORESTRICTIONS: {
-      return PP_MakeInt32(
-          instance_->delegate()->GetLocalDataRestrictions(
-              instance_->container()->element().document().url(),
-              instance_->plugin_url()));
-    }
-    default:
-      // No other settings are supported in-process.
-      return PP_MakeUndefined();
-  }
-}
-
 }  // namespace ppapi
 }  // namespace webkit
diff --git a/webkit/plugins/ppapi/ppb_flash_impl.h b/webkit/plugins/ppapi/ppb_flash_impl.h
index 34ed979..7c2c690 100644
--- a/webkit/plugins/ppapi/ppb_flash_impl.h
+++ b/webkit/plugins/ppapi/ppb_flash_impl.h
@@ -46,8 +46,6 @@ class PPB_Flash_Impl : public ::ppapi::thunk::PPB_Flash_API {
                            PP_Bool from_user_action) OVERRIDE;
   virtual PP_Bool IsRectTopmost(PP_Instance instance,
                                 const PP_Rect* rect) OVERRIDE;
-  virtual PP_Var GetSetting(PP_Instance instance,
-                            PP_FlashSetting setting) OVERRIDE;
 
  private:
   PluginInstance* instance_;