Change how ui::Clipboard is accessed so there's only one per thread.

chrome/browser/ui/omnibox/omnibox_view_unittest.cc

 // Copyright (c) 2012 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/ui/omnibox/omnibox_view.h"
 #include "base/message_loop.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 22 matching lines @@
     "alert(0)"                                      // Single strip unsafe.
   };
 
   for (size_t i = 0; i < arraysize(urls); i++) {
     EXPECT_EQ(ASCIIToUTF16(expecteds[i]),
               OmniboxView::StripJavascriptSchemas(ASCIIToUTF16(urls[i])));
   }
 }
 
 TEST_F(OmniboxViewTest, GetClipboardText) {
-  ui::Clipboard clipboard;
+  ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
 
   const string16 kPlainText(ASCIIToUTF16("test text"));
   const std::string kURL("http://www.example.com/");
 
   // 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(kPlainText);
   }
   EXPECT_EQ(kPlainText, OmniboxView::GetClipboardText());
 
   // TODO(shess): Aura hits a DCHECK() at CommitToClipboard() if
   // ObjectMap is empty.  http://crbug.com/133848
 #if !defined(USE_AURA)
   // Does an empty clipboard get empty text?
-  clipboard.WriteObjects(ui::Clipboard::BUFFER_STANDARD,
-                         ui::Clipboard::ObjectMap());
+  clipboard->WriteObjects(ui::Clipboard::BUFFER_STANDARD,
+                          ui::Clipboard::ObjectMap());
   EXPECT_EQ(string16(), OmniboxView::GetClipboardText());
 #endif
 
   // Bookmark clipboard apparently not supported on Linux.
   // See TODO on ClipboardText.BookmarkTest.
 #if !defined(OS_POSIX) || defined(OS_MACOSX)
   const string16 kTitle(ASCIIToUTF16("The Example Company"));
   // 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(kTitle, kURL);
   }
   EXPECT_EQ(ASCIIToUTF16(kURL), OmniboxView::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(kPlainText);
     clipboard_writer.WriteBookmark(kTitle, kURL);
   }
   EXPECT_EQ(kPlainText, OmniboxView::GetClipboardText());
 #endif
 
   // Do we get nothing if there is neither text nor a bookmark?
   {
     const string16 kMarkup(ASCIIToUTF16("<strong>Hi!</string>"));
-    ui::ScopedClipboardWriter clipboard_writer(&clipboard,
+    ui::ScopedClipboardWriter clipboard_writer(clipboard,
                                                ui::Clipboard::BUFFER_STANDARD);
     clipboard_writer.WriteHTML(kMarkup, kURL);
   }
   EXPECT_TRUE(OmniboxView::GetClipboardText().empty());
 
   // Broken URL has newlines stripped.
   {
     const string16 kWrappedURL(ASCIIToUTF16(
         "http://www.chromium.org/developers/testing/chromium-\n"
         "build-infrastructure/tour-of-the-chromium-buildbot"));
-    ui::ScopedClipboardWriter clipboard_writer(&clipboard,
+    ui::ScopedClipboardWriter clipboard_writer(clipboard,
                                                ui::Clipboard::BUFFER_STANDARD);
     clipboard_writer.WriteText(kWrappedURL);
   }
 
   const string16 kFixedURL(ASCIIToUTF16(
         "http://www.chromium.org/developers/testing/chromium-"
         "build-infrastructure/tour-of-the-chromium-buildbot"));
   EXPECT_EQ(kFixedURL, OmniboxView::GetClipboardText());
 
   // Multi-line address is converted to a single-line address.
   {
     const string16 kWrappedAddress(ASCIIToUTF16(
         "1600 Amphitheatre Parkway\nMountain View, CA"));
-    ui::ScopedClipboardWriter clipboard_writer(&clipboard,
+    ui::ScopedClipboardWriter clipboard_writer(clipboard,
                                                ui::Clipboard::BUFFER_STANDARD);
     clipboard_writer.WriteText(kWrappedAddress);
   }
 
   const string16 kFixedAddress(ASCIIToUTF16(
       "1600 Amphitheatre Parkway Mountain View, CA"));
   EXPECT_EQ(kFixedAddress, OmniboxView::GetClipboardText());
 }
 
 }  // namespace