Remove clipboard argument from ScopedClipboardWriter constructor.

content/renderer/scoped_clipboard_writer_glue.cc

Index: content/renderer/scoped_clipboard_writer_glue.cc
diff --git a/content/renderer/scoped_clipboard_writer_glue.cc b/content/renderer/scoped_clipboard_writer_glue.cc
index 37790375303820a3454e967d92fc245b018650dd..71471344fd5be6158acc6e62f16a9db0f1b0b028 100644
--- a/content/renderer/scoped_clipboard_writer_glue.cc
+++ b/content/renderer/scoped_clipboard_writer_glue.cc
@@ -8,17 +8,18 @@
 namespace content {
 
 ScopedClipboardWriterGlue::ScopedClipboardWriterGlue(ClipboardClient* client)
-    : ui::ScopedClipboardWriter(client->GetClipboard(),
-                                ui::CLIPBOARD_TYPE_COPY_PASTE),
+    : ui::ScopedClipboardWriter(ui::CLIPBOARD_TYPE_COPY_PASTE),
       context_(client->CreateWriteContext()) {
-  // We should never have an instance where both are set.
-  DCHECK((clipboard_ && !context_.get()) ||
-         (!clipboard_ && context_.get()));
+  DCHECK(context_);
 }
 
 ScopedClipboardWriterGlue::~ScopedClipboardWriterGlue() {
   if (!objects_.empty() && context_) {
     context_->Flush(objects_);
+    // TODO(dcheng): Temporary hack while the clipboard IPCs are cleaned up.
+    // This prevents the base class destructor from also trying to (probably
+    // unsuccessfully) flush things to the clipboard.
+    objects_.clear();
   }
 }