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

chrome/browser/ui/cocoa/omnibox/omnibox_view_mac_unittest.mm

Index: chrome/browser/ui/cocoa/omnibox/omnibox_view_mac_unittest.mm
diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac_unittest.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac_unittest.mm
index 134307dfdcde99b0e09524ad522f84dcdc008247..d1504d661a9a918bdbbc7e09176d9f2d3b502ebe 100644
--- a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac_unittest.mm
+++ b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac_unittest.mm
@@ -20,7 +20,8 @@ TEST(OmniboxViewMacTest, GetClipboardText) {
   string16 text;
 
   // Does an empty clipboard get empty text?
-  clipboard.WriteObjects(ui::Clipboard::ObjectMap());
+  clipboard.WriteObjects(ui::Clipboard::BUFFER_STANDARD,
+                         ui::Clipboard::ObjectMap());
   text = OmniboxViewMac::GetClipboardText(&clipboard);
   EXPECT_EQ(string16(), text);
 
@@ -30,7 +31,8 @@ TEST(OmniboxViewMacTest, GetClipboardText) {
 
   // Can we pull straight text off the clipboard?
   {
-    ui::ScopedClipboardWriter clipboard_writer(&clipboard);
+    ui::ScopedClipboardWriter clipboard_writer(&clipboard,
+                                               ui::Clipboard::BUFFER_STANDARD);
     clipboard_writer.WriteText(plainText);
   }
 
@@ -39,7 +41,8 @@ TEST(OmniboxViewMacTest, GetClipboardText) {
 
   // Can we pull a bookmark off the clipboard?
   {
-    ui::ScopedClipboardWriter clipboard_writer(&clipboard);
+    ui::ScopedClipboardWriter clipboard_writer(&clipboard,
+                                               ui::Clipboard::BUFFER_STANDARD);
     clipboard_writer.WriteBookmark(title, url);
   }
 
@@ -48,7 +51,8 @@ TEST(OmniboxViewMacTest, GetClipboardText) {
 
   // Do we pull text in preference to a bookmark?
   {
-    ui::ScopedClipboardWriter clipboard_writer(&clipboard);
+    ui::ScopedClipboardWriter clipboard_writer(&clipboard,
+                                               ui::Clipboard::BUFFER_STANDARD);
     clipboard_writer.WriteText(plainText);
     clipboard_writer.WriteBookmark(title, url);
   }
@@ -59,7 +63,8 @@ TEST(OmniboxViewMacTest, GetClipboardText) {
   // Do we get nothing if there is neither text nor a bookmark?
   {
     const string16 markup(ASCIIToUTF16("<strong>Hi!</string>"));
-    ui::ScopedClipboardWriter clipboard_writer(&clipboard);
+    ui::ScopedClipboardWriter clipboard_writer(&clipboard,
+                                               ui::Clipboard::BUFFER_STANDARD);
     clipboard_writer.WriteHTML(markup, url);
   }