2 files changed, 4 insertions, 13 deletions
diff --git a/chrome/common/clipboard_service.h b/chrome/common/clipboard_service.h
index ed34afd..2ebcdd0 100644
--- a/chrome/common/clipboard_service.h
+++ b/chrome/common/clipboard_service.h
@@ -2,23 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_COMMON_CLIPBOARD_SERVICE_H__
-#define CHROME_COMMON_CLIPBOARD_SERVICE_H__
-
-#include <string>
-#include <vector>
+#ifndef CHROME_COMMON_CLIPBOARD_SERVICE_H_
+#define CHROME_COMMON_CLIPBOARD_SERVICE_H_
 
 #include "base/clipboard.h"
 
-class SkBitmap;
-
 class ClipboardService : public Clipboard {
  public:
   ClipboardService() {}
 
  private:
 
-  DISALLOW_EVIL_CONSTRUCTORS(ClipboardService);
+  DISALLOW_COPY_AND_ASSIGN(ClipboardService);
 };
 
-#endif  // CHROME_COMMON_CLIPBOARD_SERVICE_H__
+#endif  // CHROME_COMMON_CLIPBOARD_SERVICE_H_
diff --git a/chrome/common/temp_scaffolding_stubs.h b/chrome/common/temp_scaffolding_stubs.h
index 22b220c..83dbc74 100644
--- a/chrome/common/temp_scaffolding_stubs.h
+++ b/chrome/common/temp_scaffolding_stubs.h
@@ -175,10 +175,6 @@ void InstallJankometer(const CommandLine&);
 //---------------------------------------------------------------------------
 // These stubs are for BrowserProcessImpl
 
-class ClipboardService : public Clipboard {
- public:
-};
-
 class CancelableTask;
 class ViewMsg_Print_Params;