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

chrome/test/base/testing_browser_process.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/test/base/testing_browser_process.h"
 
 #include "base/string_util.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/policy/policy_service.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prerender/prerender_tracker.h"
 #include "chrome/browser/printing/background_printing_manager.h"
 #include "chrome/browser/printing/print_preview_tab_controller.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "content/public/browser/notification_service.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/clipboard/clipboard.h"
 
 #if !defined(ENABLE_CONFIGURATION_POLICY)
 #include "chrome/browser/policy/policy_service_stub.h"
 #endif  // defined(ENABLE_CONFIGURATION_POLICY)
 
 TestingBrowserProcess::TestingBrowserProcess()
     : notification_service_(content::NotificationService::Create()),
       module_ref_count_(0),
       app_locale_("en"),
       local_state_(NULL),
@@ skipping 87 matching lines @@
 net::URLRequestContextGetter* TestingBrowserProcess::system_request_context() {
   return NULL;
 }
 
 #if defined(OS_CHROMEOS)
 chromeos::OomPriorityManager* TestingBrowserProcess::oom_priority_manager() {
   return NULL;
 }
 #endif  // defined(OS_CHROMEOS)
 
-ui::Clipboard* TestingBrowserProcess::clipboard() {
-  if (!clipboard_.get()) {
-    // Note that we need a MessageLoop for the next call to work.
-    clipboard_.reset(new ui::Clipboard);
-  }
-  return clipboard_.get();
-}
-
 extensions::EventRouterForwarder*
 TestingBrowserProcess::extension_event_router_forwarder() {
   return NULL;
 }
 
 NotificationUIManager* TestingBrowserProcess::notification_ui_manager() {
 #if defined(ENABLE_NOTIFICATIONS)
   if (!notification_ui_manager_.get())
     notification_ui_manager_.reset(
         NotificationUIManager::Create(local_state()));
@@ skipping 124 matching lines @@
 
 void TestingBrowserProcess::SetBrowserPolicyConnector(
     policy::BrowserPolicyConnector* connector) {
   browser_policy_connector_.reset(connector);
 }
 
 void TestingBrowserProcess::SetSafeBrowsingService(
     SafeBrowsingService* sb_service) {
   sb_service_ = sb_service;
 }