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

ui/views/controls/textfield/textfield_views_model_unittest.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 <vector>
 
 #include "base/auto_reset.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/string16.h"
@@ skipping 477 matching lines @@
   EXPECT_EQ(0U, model.GetCursorPosition());
 }
 
 #if defined(USE_AURA) && defined(OS_LINUX)
 #define MAYBE_Clipboard DISABLED_Clipboard  // http://crbug.com/97845
 #else
 #define MAYBE_Clipboard Clipboard
 #endif
 TEST_F(TextfieldViewsModelTest, MAYBE_Clipboard) {
   ui::Clipboard* clipboard
-      = views::ViewsDelegate::views_delegate->GetClipboard();
+      = ui::Clipboard::GetForCurrentThread();
   string16 initial_clipboard_text = ASCIIToUTF16("initial text");
   ui::ScopedClipboardWriter(
       clipboard,
       ui::Clipboard::BUFFER_STANDARD).WriteText(initial_clipboard_text);
 
   string16 clipboard_text;
   TextfieldViewsModel model(NULL);
   model.Append(ASCIIToUTF16("HELLO WORLD"));
 
   // Cut with an empty selection should do nothing.
@@ skipping 1018 matching lines @@
   EXPECT_TRUE(model.Undo());
   EXPECT_STR_EQ("ABCDE", model.GetText());
   EXPECT_TRUE(model.Redo());
   EXPECT_STR_EQ("1234", model.GetText());
   EXPECT_FALSE(model.Redo());
 
   // TODO(oshima): We need MockInputMethod to test the behavior with IME.
 }
 
 }  // namespace views