Remove the old PPB_Flash proxy.

This removes the old, unused PPB_Flash proxy and related code.

BUG=
TBR=brettw

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

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

6 files changed, 1 insertions, 83 deletions

diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index e0ee3b00..c9e60ad 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -217,8 +217,6 @@
         '../plugins/ppapi/ppb_file_ref_impl.h',
         '../plugins/ppapi/ppb_file_system_impl.cc',
         '../plugins/ppapi/ppb_file_system_impl.h',
-        '../plugins/ppapi/ppb_flash_impl.cc',
-        '../plugins/ppapi/ppb_flash_impl.h',
         '../plugins/ppapi/ppb_flash_message_loop_impl.cc',
         '../plugins/ppapi/ppb_flash_message_loop_impl.h',
         '../plugins/ppapi/ppb_gpu_blacklist_private_impl.cc',
diff --git a/webkit/plugins/ppapi/plugin_module.cc b/webkit/plugins/ppapi/plugin_module.cc
index f7fda16..b07c6af 100644
--- a/webkit/plugins/ppapi/plugin_module.cc
+++ b/webkit/plugins/ppapi/plugin_module.cc
@@ -110,7 +110,6 @@
 #include "webkit/plugins/ppapi/ppapi_interface_factory.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 #include "webkit/plugins/ppapi/ppb_directory_reader_impl.h"
-#include "webkit/plugins/ppapi/ppb_flash_impl.h"
 #include "webkit/plugins/ppapi/ppb_gpu_blacklist_private_impl.h"
 #include "webkit/plugins/ppapi/ppb_graphics_2d_impl.h"
 #include "webkit/plugins/ppapi/ppb_image_data_impl.h"
diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
index 0b15838..ba9a0bd 100644
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
@@ -387,8 +387,7 @@ PluginInstance::PluginInstance(
       text_input_caret_set_(false),
       selection_caret_(0),
       selection_anchor_(0),
-      pending_user_gesture_(0.0),
-      flash_impl_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
+      pending_user_gesture_(0.0) {
   pp_instance_ = HostGlobals::Get()->AddInstance(this);
 
   memset(&current_print_settings_, 0, sizeof(current_print_settings_));
@@ -2132,10 +2131,6 @@ PP_Bool PluginInstance::GetScreenSize(PP_Instance instance, PP_Size* size) {
   return PP_TRUE;
 }
 
-::ppapi::thunk::PPB_Flash_API* PluginInstance::GetFlashAPI() {
-  return &flash_impl_;
-}
-
 ::ppapi::Resource* PluginInstance::GetSingletonResource(
     PP_Instance instance,
     ::ppapi::SingletonResourceID id) {
diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.h b/webkit/plugins/ppapi/ppapi_plugin_instance.h
index da6d4a5..19122bb 100644
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.h
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.h
@@ -51,7 +51,6 @@
 #include "ui/base/ime/text_input_type.h"
 #include "ui/gfx/rect.h"
 #include "webkit/plugins/ppapi/plugin_delegate.h"
-#include "webkit/plugins/ppapi/ppb_flash_impl.h"
 #include "webkit/plugins/ppapi/ppp_pdf.h"
 #include "webkit/plugins/webkit_plugins_export.h"
 
@@ -372,7 +371,6 @@ class WEBKIT_PLUGINS_EXPORT PluginInstance :
                                 PP_Bool fullscreen) OVERRIDE;
   virtual PP_Bool GetScreenSize(PP_Instance instance, PP_Size* size)
       OVERRIDE;
-  virtual ::ppapi::thunk::PPB_Flash_API* GetFlashAPI() OVERRIDE;
   virtual ::ppapi::Resource* GetSingletonResource(PP_Instance instance,
       ::ppapi::SingletonResourceID id) OVERRIDE;
   virtual int32_t RequestInputEvents(PP_Instance instance,
@@ -756,9 +754,6 @@ class WEBKIT_PLUGINS_EXPORT PluginInstance :
   // a user gesture after it has been processed.
   PP_TimeTicks pending_user_gesture_;
 
-  // The Flash proxy is associated with the instance.
-  PPB_Flash_Impl flash_impl_;
-
   // We store the arguments so we can re-send them if we are reset to talk to
   // NaCl via the IPC NaCl proxy.
   std::vector<std::string> argn_;
diff --git a/webkit/plugins/ppapi/ppb_flash_impl.cc b/webkit/plugins/ppapi/ppb_flash_impl.cc
deleted file mode 100644
index 9e321b4..0000000
--- a/webkit/plugins/ppapi/ppb_flash_impl.cc
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "webkit/plugins/ppapi/ppb_flash_impl.h"
-
-#include <string>
-
-#include "googleurl/src/gurl.h"
-#include "ppapi/c/private/ppb_flash.h"
-#include "ppapi/c/trusted/ppb_browser_font_trusted.h"
-#include "ppapi/shared_impl/time_conversion.h"
-#include "ppapi/shared_impl/var.h"
-#include "ppapi/thunk/enter.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginContainer.h"
-#include "webkit/plugins/ppapi/common.h"
-#include "webkit/plugins/ppapi/host_globals.h"
-#include "webkit/plugins/ppapi/plugin_delegate.h"
-#include "webkit/plugins/ppapi/plugin_module.h"
-#include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
-#include "webkit/plugins/ppapi/resource_helper.h"
-
-using ppapi::PPTimeToTime;
-using ppapi::StringVar;
-using ppapi::thunk::EnterResourceNoLock;
-
-namespace webkit {
-namespace ppapi {
-
-PPB_Flash_Impl::PPB_Flash_Impl(PluginInstance* instance) {
-}
-
-PPB_Flash_Impl::~PPB_Flash_Impl() {
-}
-
-}  // namespace ppapi
-}  // namespace webkit
diff --git a/webkit/plugins/ppapi/ppb_flash_impl.h b/webkit/plugins/ppapi/ppb_flash_impl.h
deleted file mode 100644
index f407fe5..0000000
--- a/webkit/plugins/ppapi/ppb_flash_impl.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef WEBKIT_PLUGINS_PPAPI_PPB_FLASH_IMPL_H_
-#define WEBKIT_PLUGINS_PPAPI_PPB_FLASH_IMPL_H_
-
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
-#include "base/memory/scoped_ptr.h"
-#include "build/build_config.h"
-#include "ppapi/thunk/ppb_flash_api.h"
-
-namespace webkit {
-namespace ppapi {
-
-class PluginInstance;
-
-class PPB_Flash_Impl : public ::ppapi::thunk::PPB_Flash_API {
- public:
-  explicit PPB_Flash_Impl(PluginInstance* instance);
-  virtual ~PPB_Flash_Impl();
-
-  DISALLOW_COPY_AND_ASSIGN(PPB_Flash_Impl);
-};
-
-}  // namespace ppapi
-}  // namespace webkit
-
-#endif  // WEBKIT_PLUGINS_PPAPI_PPB_FLASH_IMPL_H_