Get rid of the ClipboardService class and header... it is nothing but a shell around base::Clipboard now.

http://crbug.com/11387

Review URL: http://codereview.chromium.org/105011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15274 0039d316-1c4b-4281-b951-d872f2087c98

9 files changed, 28 insertions, 33 deletions

diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
index 4543c30..8649df7 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
@@ -30,7 +30,6 @@
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/views/location_bar_view.h"
-#include "chrome/common/clipboard_service.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/gfx/utils.h"
 #include "chrome/common/l10n_util.h"
@@ -1145,7 +1144,7 @@ void AutocompleteEditViewWin::OnCopy() {
   if (text.empty())
     return;
 
-  ScopedClipboardWriter scw(g_browser_process->clipboard_service());
+  ScopedClipboardWriter scw(g_browser_process->clipboard());
   scw.WriteText(text);
 
   // Check if the user is copying the whole address bar.  If they are, we
@@ -2092,7 +2091,7 @@ void AutocompleteEditViewWin::TextChanged() {
 
 std::wstring AutocompleteEditViewWin::GetClipboardText() const {
   // Try text format.
-  ClipboardService* clipboard = g_browser_process->clipboard_service();
+  Clipboard* clipboard = g_browser_process->clipboard();
   if (clipboard->IsFormatAvailable(Clipboard::GetPlainTextWFormatType())) {
     std::wstring text;
     clipboard->ReadText(&text);
diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
index 15ead3e..7e1a46f 100644
--- a/chrome/browser/browser_process.h
+++ b/chrome/browser/browser_process.h
@@ -16,7 +16,7 @@
 #include "base/basictypes.h"
 
 class AutomationProviderList;
-class ClipboardService;
+class Clipboard;
 class DevToolsManager;
 class DownloadRequestManager;
 class GoogleURLTracker;
@@ -79,7 +79,7 @@ class BrowserProcess {
   virtual PrefService* local_state() = 0;
   virtual DebuggerWrapper* debugger_wrapper() = 0;
   virtual DevToolsManager* devtools_manager() = 0;
-  virtual ClipboardService* clipboard_service() = 0;
+  virtual Clipboard* clipboard() = 0;
 
   // Returns the thread that we perform I/O coordination on (network requests,
   // communication with renderers, etc.
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 085f773..0c3e9ea 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/browser_process_impl.h"
 
+#include "base/clipboard.h"
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/thread.h"
@@ -24,7 +25,6 @@
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/clipboard_service.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
@@ -112,7 +112,7 @@ BrowserProcessImpl::BrowserProcessImpl(const CommandLine& command_line)
       checked_for_new_frames_(false),
       using_new_frames_(false) {
   g_browser_process = this;
-  clipboard_service_.reset(new ClipboardService);
+  clipboard_.reset(new Clipboard);
   main_notification_service_.reset(new NotificationService);
 
   // Must be created after the NotificationService.
diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
index 0550ad9..3a5027b 100644
--- a/chrome/browser/browser_process_impl.h
+++ b/chrome/browser/browser_process_impl.h
@@ -119,9 +119,9 @@ class BrowserProcessImpl : public BrowserProcess, public NonThreadSafe {
     return devtools_manager_.get();
   }
 
-  virtual ClipboardService* clipboard_service() {
+  virtual Clipboard* clipboard() {
     DCHECK(CalledOnValidThread());
-    return clipboard_service_.get();
+    return clipboard_.get();
   }
 
   virtual IconManager* icon_manager() {
@@ -250,7 +250,7 @@ class BrowserProcessImpl : public BrowserProcess, public NonThreadSafe {
   bool created_devtools_manager_;
   scoped_ptr<DevToolsManager> devtools_manager_;
 
-  scoped_ptr<ClipboardService> clipboard_service_;
+  scoped_ptr<Clipboard> clipboard_;
 
   scoped_ptr<AutomationProviderList> automation_provider_list_;
 
diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc
index f97a5bf..a3450ab 100644
--- a/chrome/browser/download/download_util.cc
+++ b/chrome/browser/download/download_util.cc
@@ -17,7 +17,6 @@
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/drag_utils.h"
-#include "chrome/common/clipboard_service.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/os_exchange_data.h"
diff --git a/chrome/browser/renderer_host/resource_message_filter.cc b/chrome/browser/renderer_host/resource_message_filter.cc
index 180b37a..6a51ee7 100644
--- a/chrome/browser/renderer_host/resource_message_filter.cc
+++ b/chrome/browser/renderer_host/resource_message_filter.cc
@@ -23,7 +23,6 @@
 #include "chrome/common/app_cache/app_cache_dispatcher_host.h"
 #include "chrome/common/chrome_plugin_lib.h"
 #include "chrome/common/chrome_plugin_util.h"
-#include "chrome/common/clipboard_service.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
@@ -98,7 +97,7 @@ class WriteClipboardTask : public Task {
   ~WriteClipboardTask() {}
 
   void Run() {
-    g_browser_process->clipboard_service()->WriteObjects(*objects_.get());
+    g_browser_process->clipboard()->WriteObjects(*objects_.get());
   }
 
  private:
@@ -570,21 +569,21 @@ void ResourceMessageFilter::OnClipboardWriteObjects(
 
 void ResourceMessageFilter::OnClipboardIsFormatAvailable(
     Clipboard::FormatType format, IPC::Message* reply) {
-  const bool result = GetClipboardService()->IsFormatAvailable(format);
+  const bool result = GetClipboard()->IsFormatAvailable(format);
   ViewHostMsg_ClipboardIsFormatAvailable::WriteReplyParams(reply, result);
   Send(reply);
 }
 
 void ResourceMessageFilter::OnClipboardReadText(IPC::Message* reply) {
   string16 result;
-  GetClipboardService()->ReadText(&result);
+  GetClipboard()->ReadText(&result);
   ViewHostMsg_ClipboardReadText::WriteReplyParams(reply, result);
   Send(reply);
 }
 
 void ResourceMessageFilter::OnClipboardReadAsciiText(IPC::Message* reply) {
   std::string result;
-  GetClipboardService()->ReadAsciiText(&result);
+  GetClipboard()->ReadAsciiText(&result);
   ViewHostMsg_ClipboardReadAsciiText::WriteReplyParams(reply, result);
   Send(reply);
 }
@@ -592,7 +591,7 @@ void ResourceMessageFilter::OnClipboardReadAsciiText(IPC::Message* reply) {
 void ResourceMessageFilter::OnClipboardReadHTML(IPC::Message* reply) {
   std::string src_url_str;
   string16 markup;
-  GetClipboardService()->ReadHTML(&markup, &src_url_str);
+  GetClipboard()->ReadHTML(&markup, &src_url_str);
   const GURL src_url = GURL(src_url_str);
 
   ViewHostMsg_ClipboardReadHTML::WriteReplyParams(reply, markup, src_url);
@@ -758,12 +757,12 @@ void ResourceMessageFilter::OnScriptedPrintReply(
 #endif  // OS_WIN
 
 // static
-ClipboardService* ResourceMessageFilter::GetClipboardService() {
+Clipboard* ResourceMessageFilter::GetClipboard() {
   // We have a static instance of the clipboard service for use by all message
   // filters.  This instance lives for the life of the browser processes.
-  static ClipboardService* clipboard_service = new ClipboardService();
+  static Clipboard* clipboard = new Clipboard;
 
-  return clipboard_service;
+  return clipboard;
 }
 
 // Notes about SpellCheck.
diff --git a/chrome/browser/renderer_host/resource_message_filter.h b/chrome/browser/renderer_host/resource_message_filter.h
index e16ac8d..f394745 100644
--- a/chrome/browser/renderer_host/resource_message_filter.h
+++ b/chrome/browser/renderer_host/resource_message_filter.h
@@ -31,7 +31,7 @@
 
 class AppCacheDispatcherHost;
 class AudioRendererHost;
-class ClipboardService;
+class Clipboard;
 class Profile;
 class RenderWidgetHelper;
 class SpellChecker;
@@ -217,12 +217,11 @@ class ResourceMessageFilter : public IPC::ChannelProxy::MessageFilter,
   void DoOnClipboardReadHTML(IPC::Message* reply_msg);
 #endif
 
-  // We have our own clipboard service because we want to access the clipboard
-  // on the IO thread instead of forwarding (possibly synchronous) messages to
-  // the UI thread.
-  // This instance of the clipboard service should be accessed only on the IO
+  // We have our own clipboard because we want to access the clipboard on the
+  // IO thread instead of forwarding (possibly synchronous) messages to the UI
+  // thread. This instance of the clipboard should be accessed only on the IO
   // thread.
-  static ClipboardService* GetClipboardService();
+  static Clipboard* GetClipboard();
 
   // The channel associated with the renderer connection. This pointer is not
   // owned by this class.
diff --git a/chrome/browser/renderer_host/resource_message_filter_gtk.cc b/chrome/browser/renderer_host/resource_message_filter_gtk.cc
index dc00486..8328a90 100644
--- a/chrome/browser/renderer_host/resource_message_filter_gtk.cc
+++ b/chrome/browser/renderer_host/resource_message_filter_gtk.cc
@@ -7,7 +7,6 @@
 #include "base/clipboard.h"
 #include "base/gfx/gtk_native_view_id_manager.h"
 #include "chrome/browser/chrome_thread.h"
-#include "chrome/common/clipboard_service.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/x11_util.h"
 
@@ -104,7 +103,7 @@ void ResourceMessageFilter::DoOnGetRootWindowRect(gfx::NativeViewId view,
 // Called on the UI thread.
 void ResourceMessageFilter::DoOnClipboardIsFormatAvailable(
     Clipboard::FormatType format, IPC::Message* reply_msg) {
-  const bool result = GetClipboardService()->IsFormatAvailable(format);
+  const bool result = GetClipboard()->IsFormatAvailable(format);
 
   ViewHostMsg_ClipboardIsFormatAvailable::WriteReplyParams(reply_msg, result);
 
@@ -116,7 +115,7 @@ void ResourceMessageFilter::DoOnClipboardIsFormatAvailable(
 // Called on the UI thread.
 void ResourceMessageFilter::DoOnClipboardReadText(IPC::Message* reply_msg) {
   string16 result;
-  GetClipboardService()->ReadText(&result);
+  GetClipboard()->ReadText(&result);
 
   ViewHostMsg_ClipboardReadText::WriteReplyParams(reply_msg, result);
 
@@ -129,7 +128,7 @@ void ResourceMessageFilter::DoOnClipboardReadText(IPC::Message* reply_msg) {
 void ResourceMessageFilter::DoOnClipboardReadAsciiText(
     IPC::Message* reply_msg) {
   std::string result;
-  GetClipboardService()->ReadAsciiText(&result);
+  GetClipboard()->ReadAsciiText(&result);
 
   ViewHostMsg_ClipboardReadAsciiText::WriteReplyParams(reply_msg, result);
 
@@ -142,7 +141,7 @@ void ResourceMessageFilter::DoOnClipboardReadAsciiText(
 void ResourceMessageFilter::DoOnClipboardReadHTML(IPC::Message* reply_msg) {
   std::string src_url_str;
   string16 markup;
-  GetClipboardService()->ReadHTML(&markup, &src_url_str);
+  GetClipboard()->ReadHTML(&markup, &src_url_str);
   const GURL src_url = GURL(src_url_str);
 
   ViewHostMsg_ClipboardReadHTML::WriteReplyParams(reply_msg, markup, src_url);
diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc
index 228efc7..3a22a5a 100644
--- a/chrome/browser/tab_contents/render_view_context_menu.cc
+++ b/chrome/browser/tab_contents/render_view_context_menu.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/tab_contents/render_view_context_menu.h"
 
+#include "base/clipboard.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/scoped_clipboard_writer.h"
@@ -17,7 +18,6 @@
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/clipboard_service.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/platform_util.h"
 #include "chrome/common/pref_service.h"
@@ -647,7 +647,7 @@ void RenderViewContextMenu::Inspect(int x, int y) {
 
 void RenderViewContextMenu::WriteTextToClipboard(
     const string16& text) {
-  ClipboardService* clipboard = g_browser_process->clipboard_service();
+  Clipboard* clipboard = g_browser_process->clipboard();
 
   if (!clipboard)
     return;