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

ui/views/test/test_views_delegate.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 "ui/views/test/test_views_delegate.h"
 
 #include "base/logging.h"
 #include "content/public/test/web_contents_tester.h"
-#include "ui/base/clipboard/clipboard.h"
 
 namespace views {
 
 TestViewsDelegate::TestViewsDelegate()
     : use_transparent_windows_(false) {
   DCHECK(!ViewsDelegate::views_delegate);
   ViewsDelegate::views_delegate = this;
 }
 
 TestViewsDelegate::~TestViewsDelegate() {
   ViewsDelegate::views_delegate = NULL;
 }
 
 void TestViewsDelegate::SetUseTransparentWindows(bool transparent) {
   use_transparent_windows_ = transparent;
 }
 
-ui::Clipboard* TestViewsDelegate::GetClipboard() const {
-  if (!clipboard_.get()) {
-    // Note that we need a MessageLoop for the next call to work.
-    clipboard_.reset(new ui::Clipboard);
-  }
-  return clipboard_.get();
-}
-
 void TestViewsDelegate::SaveWindowPlacement(const Widget* window,
                                             const std::string& window_name,
                                             const gfx::Rect& bounds,
                                             ui::WindowShowState show_state) {
 }
 
 bool TestViewsDelegate::GetSavedWindowPlacement(
     const std::string& window_name,
     gfx::Rect* bounds,
     ui:: WindowShowState* show_state) const {
@@ skipping 20 matching lines @@
 }
 #endif
 
 content::WebContents* TestViewsDelegate::CreateWebContents(
     content::BrowserContext* browser_context,
     content::SiteInstance* site_instance) {
   return NULL;
 }
 
 }  // namespace views