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

chrome/browser/bookmarks/bookmark_node_data.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/bookmarks/bookmark_node_data.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/pickle.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/url_constants.h"
 #include "net/base/escape.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 
 #if defined(OS_MACOSX)
 #include "chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.h"
 #else
 #include "chrome/browser/browser_process.h"

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

Remove this include?

 #endif
 
 const char* BookmarkNodeData::kClipboardFormatString =
     "chromium/x-bookmark-entries";
 
 BookmarkNodeData::Element::Element() : is_url(false), id_(0) {
 }
 
 BookmarkNodeData::Element::Element(const BookmarkNode* node)
     : is_url(node->is_url()),
@@ skipping 100 matching lines @@
   element.url = url;
   element.is_url = true;
 
   elements.push_back(element);
 
   return true;
 }
 
 #if !defined(OS_MACOSX)
 void BookmarkNodeData::WriteToClipboard(Profile* profile) const {
-  ui::ScopedClipboardWriter scw(g_browser_process->clipboard(),
+  ui::ScopedClipboardWriter scw(ui::Clipboard::GetForCurrentThread(),
                                 ui::Clipboard::BUFFER_STANDARD);
 
   // If there is only one element and it is a URL, write the URL to the
   // clipboard.
   if (elements.size() == 1 && elements[0].is_url) {
     const string16& title = elements[0].title;
     const std::string url = elements[0].url.spec();
 
     scw.WriteBookmark(title, url);
     scw.WriteHyperlink(net::EscapeForHTML(title), url);
 
     // Also write the URL to the clipboard as text so that it can be pasted
     // into text fields. We use WriteText instead of WriteURL because we don't
     // want to clobber the X clipboard when the user copies out of the omnibox
     // on Linux (on Windows and Mac, there is no difference between these
     // functions).
     scw.WriteText(UTF8ToUTF16(url));
   }
 
   Pickle pickle;
   WriteToPickle(profile, &pickle);
   scw.WritePickledData(
       pickle, ui::Clipboard::GetFormatType(kClipboardFormatString));
 }
 
 bool BookmarkNodeData::ReadFromClipboard() {
   std::string data;
-  ui::Clipboard* clipboard = g_browser_process->clipboard();
+  ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
   clipboard->ReadData(ui::Clipboard::GetFormatType(kClipboardFormatString),
                       &data);
 
   if (!data.empty()) {
     Pickle pickle(data.data(), data.size());
     if (ReadFromPickle(&pickle))
       return true;
   }
 
   string16 title;
   std::string url;
   clipboard->ReadBookmark(&title, &url);
   if (!url.empty()) {
     Element element;
     element.is_url = true;
     element.url = GURL(url);
     element.title = title;
 
     elements.clear();
     elements.push_back(element);
     return true;
   }
 
   return false;
 }
 
 bool BookmarkNodeData::ClipboardContainsBookmarks() {
-  return g_browser_process->clipboard()->IsFormatAvailable(
+  return ui::Clipboard::GetForCurrentThread()->IsFormatAvailable(
       ui::Clipboard::GetFormatType(kClipboardFormatString),
       ui::Clipboard::BUFFER_STANDARD);
 }
 #else
 void BookmarkNodeData::WriteToClipboard(Profile* profile) const {
   bookmark_pasteboard_helper_mac::WriteToPasteboard(
       bookmark_pasteboard_helper_mac::kCopyPastePasteboard,
       elements,
       profile_path_.value());
 }
@@ skipping 134 matching lines @@
   DCHECK(profile_path_.empty());
 
   if (profile)
     profile_path_ = profile->GetPath();
 }
 
 bool BookmarkNodeData::IsFromProfile(Profile* profile) const {
   // An empty path means the data is not associated with any profile.
   return !profile_path_.empty() && profile_path_ == profile->GetPath();
 }