Cleanup forward declared classes that are not needed in chrome/renderer, chrome/test/, and chrome/views. Also fix some lint issues while I'm at it.

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

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

2 files changed, 8 insertions, 12 deletions

diff --git a/chrome/test/automation/automation_proxy.h b/chrome/test/automation/automation_proxy.h
index dc53672..22fdebc 100644
--- a/chrome/test/automation/automation_proxy.h
+++ b/chrome/test/automation/automation_proxy.h
@@ -18,9 +18,8 @@
 
 class AutomationRequest;
 class BrowserProxy;
-class WindowProxy;
 class TabProxy;
-class AutocompleteEditProxy;
+class WindowProxy;
 
 // This is an interface that AutomationProxy-related objects can use to
 // access the message-sending abilities of the Proxy.
@@ -178,9 +177,9 @@ class AutomationProxy : public IPC::Channel::Listener,
   // Clears the current AutomationRequest object.
   void clear_current_request() { current_request_ = NULL; }
 
-  // Wrapper over AutomationHandleTracker::InvalidateHandle. Receives the message
-  // from AutomationProxy, unpacks the messages and routes that call to the
-  // tracker.
+  // Wrapper over AutomationHandleTracker::InvalidateHandle. Receives the
+  // message from AutomationProxy, unpacks the messages and routes that call to
+  // the tracker.
   void InvalidateHandle(const IPC::Message& message);
 
   // Creates a tab that can hosted in an external process. The function
@@ -194,8 +193,6 @@ class AutomationProxy : public IPC::Channel::Listener,
   }
 
  private:
-  DISALLOW_EVIL_CONSTRUCTORS(AutomationProxy);
-
   void InitializeEvents();
   void InitializeChannelID();
   void InitializeThread();
@@ -216,6 +213,8 @@ class AutomationProxy : public IPC::Channel::Listener,
 
   // Delay to let the browser execute the command.
   int command_execution_timeout_ms_;
+
+  DISALLOW_COPY_AND_ASSIGN(AutomationProxy);
 };
 
 #endif  // CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_H__
diff --git a/chrome/test/automation/window_proxy.h b/chrome/test/automation/window_proxy.h
index 1f3da79..76c863e 100644
--- a/chrome/test/automation/window_proxy.h
+++ b/chrome/test/automation/window_proxy.h
@@ -12,9 +12,7 @@
 #include "base/thread.h"
 #include "chrome/test/automation/automation_handle_tracker.h"
 
-class GURL;
 class BrowserProxy;
-class TabProxy;
 class WindowProxy;
 
 namespace gfx {
@@ -86,8 +84,7 @@ class WindowProxy : public AutomationResourceProxy {
   BrowserProxy* GetBrowserWithTimeout(uint32 timeout_ms, bool* is_timeout);
 
  private:
-  DISALLOW_EVIL_CONSTRUCTORS(WindowProxy);
+  DISALLOW_COPY_AND_ASSIGN(WindowProxy);
 };
 
-#endif // CHROME_TEST_AUTOMATION_WINDOW_PROXY_H__
-
+#endif  // CHROME_TEST_AUTOMATION_WINDOW_PROXY_H__