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

1 files changed, 6 insertions, 6 deletions

diff --git a/chrome/test/testing_browser_process.h b/chrome/test/testing_browser_process.h
index 42949b0..c42eb61 100644
--- a/chrome/test/testing_browser_process.h
+++ b/chrome/test/testing_browser_process.h
@@ -14,10 +14,10 @@
 
 #include <string>
 
+#include "base/clipboard.h"
 #include "base/string_util.h"
 #include "base/waitable_event.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/common/clipboard_service.h"
 #include "chrome/common/notification_service.h"
 
 class TestingBrowserProcess : public BrowserProcess {
@@ -86,12 +86,12 @@ class TestingBrowserProcess : public BrowserProcess {
     return NULL;
   }
 
-  virtual ClipboardService* clipboard_service() {
-    if (!clipboard_service_.get()) {
+  virtual Clipboard* clipboard() {
+    if (!clipboard_.get()) {
       // Note that we need a MessageLoop for the next call to work.
-      clipboard_service_.reset(new ClipboardService);
+      clipboard_.reset(new Clipboard);
     }
-    return clipboard_service_.get();
+    return clipboard_.get();
   }
 
   virtual GoogleURLTracker* google_url_tracker() {
@@ -143,7 +143,7 @@ class TestingBrowserProcess : public BrowserProcess {
  private:
   NotificationService notification_service_;
   scoped_ptr<base::WaitableEvent> shutdown_event_;
-  scoped_ptr<ClipboardService> clipboard_service_;
+  scoped_ptr<Clipboard> clipboard_;
 
   DISALLOW_COPY_AND_ASSIGN(TestingBrowserProcess);
 };