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

webkit/tools/test_shell/simple_clipboard_impl.cc

Index: webkit/tools/test_shell/simple_clipboard_impl.cc
diff --git a/webkit/tools/test_shell/simple_clipboard_impl.cc b/webkit/tools/test_shell/simple_clipboard_impl.cc
index 06d6c8b6b14dd9467cafb5239dd2c5dea3f50edd..d51e109b720b285b8bd8fde93351b70cb1f52705 100644
--- a/webkit/tools/test_shell/simple_clipboard_impl.cc
+++ b/webkit/tools/test_shell/simple_clipboard_impl.cc
@@ -23,8 +23,6 @@
 
 namespace {
 
-base::LazyInstance<ui::Clipboard> clipboard = LAZY_INSTANCE_INITIALIZER;
-
 }  // anonymous namespace
 
 SimpleClipboardClient::SimpleClipboardClient() {
@@ -35,7 +33,7 @@ SimpleClipboardClient::~SimpleClipboardClient() {
 
 
 ui::Clipboard* SimpleClipboardClient::GetClipboard() {
-  return clipboard.Pointer();
+  return ui::Clipboard::GetForCurrentThread();
 }
 
 uint64 SimpleClipboardClient::GetSequenceNumber(ui::Clipboard::Buffer buffer) {