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

webkit/tools/test_shell/simple_clipboard_impl.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 "webkit/tools/test_shell/simple_clipboard_impl.h"
 
 #include <string>
 
 #include "base/lazy_instance.h"
 #include "base/stl_util.h"
 #include "base/string16.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #if defined(USE_SYSTEM_ZLIB)
 #include <zlib.h>
 #else
 #include "third_party/zlib/zlib.h"
 #endif
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/size.h"
 #include "webkit/glue/webkit_glue.h"
 
 namespace {
 
-base::LazyInstance<ui::Clipboard> clipboard = LAZY_INSTANCE_INITIALIZER;
-
 }  // anonymous namespace
 
 SimpleClipboardClient::SimpleClipboardClient() {
 }
 
 SimpleClipboardClient::~SimpleClipboardClient() {
 }
 
 
 ui::Clipboard* SimpleClipboardClient::GetClipboard() {
-  return clipboard.Pointer();
+  return ui::Clipboard::GetForCurrentThread();
 }
 
 uint64 SimpleClipboardClient::GetSequenceNumber(ui::Clipboard::Buffer buffer) {
   return GetClipboard()->GetSequenceNumber(buffer);
 }
 
 bool SimpleClipboardClient::IsFormatAvailable(
     const ui::Clipboard::FormatType& format,
     ui::Clipboard::Buffer buffer) {
   return GetClipboard()->IsFormatAvailable(format, buffer);
@@ skipping 61 matching lines @@
 void SimpleClipboardClient::ReadCustomData(ui::Clipboard::Buffer buffer,
                                            const string16& type,
                                            string16* data) {
   GetClipboard()->ReadCustomData(buffer, type, data);
 }
 
 webkit_glue::ClipboardClient::WriteContext*
 SimpleClipboardClient::CreateWriteContext() {
   return NULL;
 }