Move flash clipboard to the new proxy and add custom format support

webkit/plugins/ppapi/ppb_flash_impl.h

Index: webkit/plugins/ppapi/ppb_flash_impl.h
diff --git a/webkit/plugins/ppapi/ppb_flash_impl.h b/webkit/plugins/ppapi/ppb_flash_impl.h
index d8aef6f1c36044c4afc6de7c0c0af0dd445264aa..c7edb4504fe934e8722079b07e051625fa816245 100644
--- a/webkit/plugins/ppapi/ppb_flash_impl.h
+++ b/webkit/plugins/ppapi/ppb_flash_impl.h
@@ -11,12 +11,6 @@
 #include "build/build_config.h"
 #include "ppapi/shared_impl/ppb_flash_shared.h"
 
-class ScopedClipboardWriterGlue;
-
-namespace webkit_glue {
-class ClipboardClient;
-}
-
 namespace webkit {
 namespace ppapi {
 
@@ -65,18 +59,6 @@ class PPB_Flash_Impl : public ::ppapi::PPB_Flash_Shared {
   virtual PP_Bool SetCrashData(PP_Instance instance,
                                PP_FlashCrashKey key,
                                PP_Var value) OVERRIDE;
-  virtual PP_Bool IsClipboardFormatAvailable(
-      PP_Instance instance,
-      PP_Flash_Clipboard_Type clipboard_type,
-      PP_Flash_Clipboard_Format format) OVERRIDE;
-  virtual PP_Var ReadClipboardData(PP_Instance instance,
-                                   PP_Flash_Clipboard_Type clipboard_type,
-                                   PP_Flash_Clipboard_Format format) OVERRIDE;
-  virtual int32_t WriteClipboardData(PP_Instance instance,
-                                     PP_Flash_Clipboard_Type clipboard_type,
-                                     uint32_t data_item_count,
-                                     const PP_Flash_Clipboard_Format formats[],
-                                     const PP_Var data_items[]) OVERRIDE;
   virtual bool CreateThreadAdapterForInstance(PP_Instance instance) OVERRIDE;
   virtual void ClearThreadAdapterForInstance(PP_Instance instance) OVERRIDE;
   virtual int32_t OpenFile(PP_Instance instance,
@@ -112,19 +94,8 @@ class PPB_Flash_Impl : public ::ppapi::PPB_Flash_Shared {
                                      PP_Size* size) OVERRIDE;
 
  private:
-  // Call to ensure that the clipboard_client is properly initialized. Returns
-  // true on success. On failure, you should not use the client.
-  bool InitClipboard();
-
-  int32_t WriteClipboardDataItem(const PP_Flash_Clipboard_Format format,
-                                 const PP_Var& data,
-                                 ScopedClipboardWriterGlue* scw);
-
   PluginInstance* instance_;
 
-  // This object is lazily created by InitClipboard.
-  scoped_ptr<webkit_glue::ClipboardClient> clipboard_client_;
-
   DISALLOW_COPY_AND_ASSIGN(PPB_Flash_Impl);
 };