Have ScopedClipboardWriter and Clipboard::WriteObjects take a buffer parameter.

ui/base/clipboard/scoped_clipboard_writer.cc

 // Copyright (c) 2011 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.
 
 // This file implements the ScopedClipboardWriter class. Documentation on its
 // purpose can be found in our header. Documentation on the format of the
 // parameters for each clipboard target can be found in clipboard.h.
 
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 
 #include "base/pickle.h"
 #include "base/utf_string_conversions.h"
 #include "ui/gfx/size.h"
 
 namespace ui {
 
-ScopedClipboardWriter::ScopedClipboardWriter(Clipboard* clipboard)
-    : clipboard_(clipboard) {
+ScopedClipboardWriter::ScopedClipboardWriter(Clipboard* clipboard,
+                                             Clipboard::Buffer buffer)
+    : clipboard_(clipboard), buffer_(buffer) {
 }
 
 ScopedClipboardWriter::~ScopedClipboardWriter() {
   if (!objects_.empty() && clipboard_) {
-    clipboard_->WriteObjects(objects_);
+    clipboard_->WriteObjects(buffer_, objects_);
     if (url_text_.length())
-      clipboard_->DidWriteURL(url_text_);
+      clipboard_->DidWriteURL(buffer_, url_text_);
   }
 }
 
 void ScopedClipboardWriter::WriteText(const string16& text) {
   WriteTextOrURL(text, false);
 }
 
 void ScopedClipboardWriter::WriteURL(const string16& text) {
   WriteTextOrURL(text, true);
 }
@@ skipping 97 matching lines @@
   objects_[Clipboard::CBF_TEXT] = parameters;
 
   if (is_url) {
     url_text_ = utf8_text;
   } else {
     url_text_.clear();
   }
 }
 
 }  // namespace ui