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

chrome/browser/bookmarks/bookmark_utils_unittest.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.
 
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 124 matching lines @@
   // Copy a node to the clipboard.
   std::vector<const BookmarkNode*> nodes;
   nodes.push_back(node);
   CopyToClipboard(&model, nodes, false);
 
   // And make sure we can paste a bookmark from the clipboard.
   EXPECT_TRUE(CanPasteFromClipboard(model.bookmark_bar_node()));
 
   // Write some text to the clipboard.
   {
-    ui::ScopedClipboardWriter clipboard_writer(g_browser_process->clipboard());
+    ui::ScopedClipboardWriter clipboard_writer(g_browser_process->clipboard(),
+                                               ui::Clipboard::BUFFER_STANDARD);
     clipboard_writer.WriteText(ASCIIToUTF16("foo"));
   }
 
   // Now we shouldn't be able to paste from the clipboard.
   EXPECT_FALSE(CanPasteFromClipboard(model.bookmark_bar_node()));
 }
 #endif
 
 }  // namespace
 }  // namespace bookmark_utils