Rewrite clipboard write IPC handling to be easier to understand.

content/browser/renderer_host/clipboard_message_filter.h

Index: content/browser/renderer_host/clipboard_message_filter.h
diff --git a/content/browser/renderer_host/clipboard_message_filter.h b/content/browser/renderer_host/clipboard_message_filter.h
index 792bfc5b774c1563b3e1a94df3ab4f50679465a5..3f01e8682dc4fa3f3d48eec14ebbd7d0b1604f53 100644
--- a/content/browser/renderer_host/clipboard_message_filter.h
+++ b/content/browser/renderer_host/clipboard_message_filter.h
@@ -9,15 +9,23 @@
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/memory/shared_memory.h"
 #include "content/common/clipboard_format.h"
+#include "content/common/content_export.h"
 #include "content/public/browser/browser_message_filter.h"
 #include "ui/base/clipboard/clipboard.h"
 
 class GURL;
 
+namespace ui {
+class ScopedClipboardWriter;
+}  // namespace ui
+
 namespace content {
 
-class ClipboardMessageFilter : public BrowserMessageFilter {
+class ClipboardMessageFilterTest;
+
+class CONTENT_EXPORT ClipboardMessageFilter : public BrowserMessageFilter {
  public:
   ClipboardMessageFilter();
 
@@ -26,12 +34,9 @@ class ClipboardMessageFilter : public BrowserMessageFilter {
   bool OnMessageReceived(const IPC::Message& message) override;
 
  private:
-  ~ClipboardMessageFilter() override;
+  friend class ClipboardMessageFilterTest;
 
-  void OnWriteObjectsAsync(const ui::Clipboard::ObjectMap& objects);
-  void OnWriteObjectsSync(const ui::Clipboard::ObjectMap& objects,
-                          base::SharedMemoryHandle bitmap_handle);
-  static void WriteObjectsOnUIThread(const ui::Clipboard::ObjectMap* objects);
+  ~ClipboardMessageFilter() override;
 
   void OnGetSequenceNumber(const ui::ClipboardType type,
                            uint64* sequence_number);
@@ -57,6 +62,22 @@ class ClipboardMessageFilter : public BrowserMessageFilter {
   void OnReadData(const ui::Clipboard::FormatType& format,
                   std::string* data);
 
+  void OnWriteText(ui::ClipboardType clipboard_type,
+                   const base::string16& text);
+  void OnWriteHTML(ui::ClipboardType clipboard_type,
+                   const base::string16& markup,
+                   const GURL& url);
+  void OnWriteSmartPasteMarker(ui::ClipboardType clipboard_type);
+  void OnWriteCustomData(ui::ClipboardType clipboard_type,
+                         const std::map<base::string16, base::string16>& data);
+  void OnWriteBookmark(ui::ClipboardType clipboard_type,
+                       const GURL& url,
+                       const base::string16& title);
+  void OnWriteImage(ui::ClipboardType clipboard_type,
+                    const gfx::Size& size,
+                    base::SharedMemoryHandle handle);
+  void OnCommitWrite(ui::ClipboardType clipboard_type);
+
 #if defined(OS_MACOSX)
   void OnFindPboardWriteString(const base::string16& text);
 #endif
@@ -67,6 +88,8 @@ class ClipboardMessageFilter : public BrowserMessageFilter {
   // thread.
   static ui::Clipboard* GetClipboard();
 
+  scoped_ptr<ui::ScopedClipboardWriter> clipboard_writer_;
+
   DISALLOW_COPY_AND_ASSIGN(ClipboardMessageFilter);
 };