Refactor 3 PPB_Flash functions to the new resource model.

This refactors the following flash functions to the new resource model.
-GetProxyForURL
-UpdateActivity
-SetCrashData

BUG=


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

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

5 files changed, 0 insertions, 37 deletions

diff --git a/webkit/plugins/ppapi/mock_plugin_delegate.cc b/webkit/plugins/ppapi/mock_plugin_delegate.cc
index 6294660..54947e7 100644
--- a/webkit/plugins/ppapi/mock_plugin_delegate.cc
+++ b/webkit/plugins/ppapi/mock_plugin_delegate.cc
@@ -400,10 +400,6 @@ void MockPluginDelegate::ZoomLimitsChanged(double minimum_factor,
                                            double maximum_factor) {
 }
 
-std::string MockPluginDelegate::ResolveProxy(const GURL& url) {
-  return std::string();
-}
-
 void MockPluginDelegate::DidStartLoading() {
 }
 
diff --git a/webkit/plugins/ppapi/mock_plugin_delegate.h b/webkit/plugins/ppapi/mock_plugin_delegate.h
index bbf9d5a..5ce5819 100644
--- a/webkit/plugins/ppapi/mock_plugin_delegate.h
+++ b/webkit/plugins/ppapi/mock_plugin_delegate.h
@@ -186,7 +186,6 @@ class MockPluginDelegate : public PluginDelegate {
   virtual std::string GetDefaultEncoding();
   virtual void ZoomLimitsChanged(double minimum_factor,
                                  double maximum_factor);
-  virtual std::string ResolveProxy(const GURL& url);
   virtual void DidStartLoading();
   virtual void DidStopLoading();
   virtual void SetContentRestriction(int restrictions);
diff --git a/webkit/plugins/ppapi/plugin_delegate.h b/webkit/plugins/ppapi/plugin_delegate.h
index a781007..a3cbd89 100644
--- a/webkit/plugins/ppapi/plugin_delegate.h
+++ b/webkit/plugins/ppapi/plugin_delegate.h
@@ -620,10 +620,6 @@ class PluginDelegate {
   virtual void ZoomLimitsChanged(double minimum_factor,
                                  double maximum_factor) = 0;
 
-  // Retrieves the proxy information for the given URL in PAC format. On error,
-  // this will return an empty string.
-  virtual std::string ResolveProxy(const GURL& url) = 0;
-
   // Tell the browser when resource loading starts/ends.
   virtual void DidStartLoading() = 0;
   virtual void DidStopLoading() = 0;
diff --git a/webkit/plugins/ppapi/ppb_flash_impl.cc b/webkit/plugins/ppapi/ppb_flash_impl.cc
index 549d3ed..237caf3 100644
--- a/webkit/plugins/ppapi/ppb_flash_impl.cc
+++ b/webkit/plugins/ppapi/ppb_flash_impl.cc
@@ -156,18 +156,6 @@ PP_Bool PPB_Flash_Impl::DrawGlyphs(PP_Instance instance,
   return PP_TRUE;
 }
 
-PP_Var PPB_Flash_Impl::GetProxyForURL(PP_Instance instance,
-                                      const char* url) {
-  GURL gurl(url);
-  if (!gurl.is_valid())
-    return PP_MakeUndefined();
-
-  std::string proxy_host = instance_->delegate()->ResolveProxy(gurl);
-  if (proxy_host.empty())
-    return PP_MakeUndefined();  // No proxy.
-  return StringVar::StringToPPVar(proxy_host);
-}
-
 int32_t PPB_Flash_Impl::Navigate(PP_Instance instance,
                                  PP_Resource request_info,
                                  const char* target,
@@ -210,10 +198,6 @@ PP_Bool PPB_Flash_Impl::IsRectTopmost(PP_Instance instance,
                 rect->size.width, rect->size.height)));
 }
 
-void PPB_Flash_Impl::UpdateActivity(PP_Instance pp_instance) {
-  // Not supported in-process.
-}
-
 PP_Var PPB_Flash_Impl::GetSetting(PP_Instance instance,
                                   PP_FlashSetting setting) {
   switch(setting) {
@@ -229,13 +213,6 @@ PP_Var PPB_Flash_Impl::GetSetting(PP_Instance instance,
   }
 }
 
-PP_Bool PPB_Flash_Impl::SetCrashData(PP_Instance instance,
-                                     PP_FlashCrashKey key,
-                                     PP_Var value) {
-  // Not implemented in process.
-  return PP_FALSE;
-}
-
 bool PPB_Flash_Impl::CreateThreadAdapterForInstance(PP_Instance instance) {
   return false;  // No multithreaded access allowed.
 }
diff --git a/webkit/plugins/ppapi/ppb_flash_impl.h b/webkit/plugins/ppapi/ppb_flash_impl.h
index 24690ba..f13130c 100644
--- a/webkit/plugins/ppapi/ppb_flash_impl.h
+++ b/webkit/plugins/ppapi/ppb_flash_impl.h
@@ -35,7 +35,6 @@ class PPB_Flash_Impl : public ::ppapi::PPB_Flash_Shared {
                              uint32_t glyph_count,
                              const uint16_t glyph_indices[],
                              const PP_Point glyph_advances[]) OVERRIDE;
-  virtual PP_Var GetProxyForURL(PP_Instance instance, const char* url) OVERRIDE;
   virtual int32_t Navigate(PP_Instance instance,
                            PP_Resource request_info,
                            const char* target,
@@ -48,12 +47,8 @@ class PPB_Flash_Impl : public ::ppapi::PPB_Flash_Shared {
                                         PP_Time t) OVERRIDE;
   virtual PP_Bool IsRectTopmost(PP_Instance instance,
                                 const PP_Rect* rect) OVERRIDE;
-  virtual void UpdateActivity(PP_Instance instance) OVERRIDE;
   virtual PP_Var GetSetting(PP_Instance instance,
                             PP_FlashSetting setting) OVERRIDE;
-  virtual PP_Bool SetCrashData(PP_Instance instance,
-                               PP_FlashCrashKey key,
-                               PP_Var value) OVERRIDE;
   virtual bool CreateThreadAdapterForInstance(PP_Instance instance) OVERRIDE;
   virtual void ClearThreadAdapterForInstance(PP_Instance instance) OVERRIDE;
   virtual int32_t OpenFile(PP_Instance instance,