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

chrome/browser/ui/views/menu_model_adapter_test.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 "base/callback.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "chrome/test/base/view_event_test_base.h"
 #include "ui/base/models/menu_model.h"
 #include "ui/ui_controls/ui_controls.h"
@@ skipping 17 matching lines @@
 // ViewsDelegate::GetDispositionForEvent() is used by views::MenuModelAdapter.
 class TestViewsDelegate : public views::ViewsDelegate {
  public:
   TestViewsDelegate() {
   }
 
   ~TestViewsDelegate() {
   }
 
   // views::ViewsDelegate implementation
-  virtual ui::Clipboard* GetClipboard() const OVERRIDE {
-    return NULL;
-  }
-
   virtual void SaveWindowPlacement(const views::Widget* widget,
                                    const std::string& window_name,
                                    const gfx::Rect& bounds,
                                    ui::WindowShowState show_state) OVERRIDE {
   }
 
   virtual bool GetSavedWindowPlacement(
       const std::string& window_name,
       gfx::Rect* bounds,
       ui::WindowShowState* show_state) const OVERRIDE {
@@ skipping 340 matching lines @@
   views::MenuItemView* menu_;
   scoped_ptr<views::MenuRunner> menu_runner_;
 };
 
 #if defined(OS_WIN)
 #define MAYBE_RebuildMenu DISABLED_RebuildMenu
 #else
 #define MAYBE_RebuildMenu RebuildMenu
 #endif
 VIEW_TEST(MenuModelAdapterTest, MAYBE_RebuildMenu)