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

chrome/browser/ui/omnibox/omnibox_view.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.
 
 // This file defines helper functions shared by the various implementations
 // of OmniboxView.
 
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 
 #include "base/string_util.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/browser_process.h"

[kaiwang, 2012/09/06 22:11:47]

remove?

 #include "ui/base/clipboard/clipboard.h"
 
 // static
 string16 OmniboxView::StripJavascriptSchemas(const string16& text) {
   const string16 kJsPrefix(ASCIIToUTF16(chrome::kJavaScriptScheme) +
                            ASCIIToUTF16(":"));
   string16 out(text);
   while (StartsWith(out, kJsPrefix, false))
     TrimWhitespace(out.substr(kJsPrefix.length()), TRIM_LEADING, &out);
   return out;
 }
 
 // static
 string16 OmniboxView::GetClipboardText() {
   // Try text format.
-  ui::Clipboard* clipboard = g_browser_process->clipboard();
+  ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
   if (clipboard->IsFormatAvailable(ui::Clipboard::GetPlainTextWFormatType(),
                                    ui::Clipboard::BUFFER_STANDARD)) {
     string16 text;
     clipboard->ReadText(ui::Clipboard::BUFFER_STANDARD, &text);
 
     // If the input contains non-newline whitespace, treat it as
     // search data and convert newlines to spaces.  For instance, a
     // street address.
     // TODO(shess): It may also make sense to ignore leading or
     // trailing whitespace when making this determination.
@@ skipping 91 matching lines @@
   // |profile| can be NULL in tests.
   if (profile)
     model_.reset(new OmniboxEditModel(this, controller, profile));
 }
 
 void OmniboxView::TextChanged() {
   EmphasizeURLComponents();
   if (model_.get())
     model_->OnChanged();
 }