Revert 141482 - Pepper Flash settings integration - camera and microphone.

BUG=112190
TEST=None

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

TBR=yzshen@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10536103

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

1 files changed, 2 insertions, 36 deletions

diff --git a/content/ppapi_plugin/broker_process_dispatcher.h b/content/ppapi_plugin/broker_process_dispatcher.h
index 7da07bf..b33a4e8 100644
--- a/content/ppapi_plugin/broker_process_dispatcher.h
+++ b/content/ppapi_plugin/broker_process_dispatcher.h
@@ -6,17 +6,13 @@
 #define CONTENT_PPAPI_PLUGIN_BROKER_PROCESS_DISPATCHER_H_
 
 #include "base/basictypes.h"
-#include "base/memory/weak_ptr.h"
 #include "ppapi/c/ppp.h"
 #include "ppapi/proxy/broker_dispatcher.h"
-#include "ppapi/shared_impl/ppp_flash_browser_operations_shared.h"
 
 // Wrapper around a BrokerDispatcher that provides the necessary integration
 // for plugin process management. This class is to avoid direct dependencies
 // from the PPAPI proxy on the Chrome multiprocess infrastructure.
-class BrokerProcessDispatcher
-    : public ppapi::proxy::BrokerSideDispatcher,
-      public base::SupportsWeakPtr<BrokerProcessDispatcher> {
+class BrokerProcessDispatcher : public ppapi::proxy::BrokerSideDispatcher {
  public:
   BrokerProcessDispatcher(PP_GetInterface_Func get_plugin_interface,
                           PP_ConnectInstance_Func connect_instance);
@@ -25,34 +21,14 @@ class BrokerProcessDispatcher
   // IPC::Channel::Listener overrides.
   virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
 
-  void OnGetPermissionSettingsCompleted(
-      uint32 request_id,
-      bool success,
-      PP_Flash_BrowserOperations_Permission default_permission,
-      const ppapi::FlashSiteSettings& sites);
-
  private:
   void OnMsgClearSiteData(const FilePath& plugin_data_path,
                           const std::string& site,
                           uint64 flags,
                           uint64 max_age);
+
   void OnMsgDeauthorizeContentLicenses(uint32 request_id,
                                        const FilePath& plugin_data_path);
-  void OnMsgGetPermissionSettings(
-      uint32 request_id,
-      const FilePath& plugin_data_path,
-      PP_Flash_BrowserOperations_SettingType setting_type);
-  void OnMsgSetDefaultPermission(
-      uint32 request_id,
-      const FilePath& plugin_data_path,
-      PP_Flash_BrowserOperations_SettingType setting_type,
-      PP_Flash_BrowserOperations_Permission permission,
-      bool clear_site_specific);
-  void OnMsgSetSitePermission(
-      uint32 request_id,
-      const FilePath& plugin_data_path,
-      PP_Flash_BrowserOperations_SettingType setting_type,
-      const ppapi::FlashSiteSettings& sites);
 
   // Requests that the plugin clear data, returning true on success.
   bool ClearSiteData(const FilePath& plugin_data_path,
@@ -60,19 +36,9 @@ class BrokerProcessDispatcher
                      uint64 flags,
                      uint64 max_age);
   bool DeauthorizeContentLicenses(const FilePath& plugin_data_path);
-  bool SetDefaultPermission(const FilePath& plugin_data_path,
-                            PP_Flash_BrowserOperations_SettingType setting_type,
-                            PP_Flash_BrowserOperations_Permission permission,
-                            bool clear_site_specific);
-  bool SetSitePermission(const FilePath& plugin_data_path,
-                         PP_Flash_BrowserOperations_SettingType setting_type,
-                         const ppapi::FlashSiteSettings& sites);
 
   PP_GetInterface_Func get_plugin_interface_;
 
-  const PPP_Flash_BrowserOperations_1_1* flash_browser_operations_1_1_;
-  const PPP_Flash_BrowserOperations_1_0* flash_browser_operations_1_0_;
-
   DISALLOW_COPY_AND_ASSIGN(BrokerProcessDispatcher);
 };