Revert "Refactor automation messages." due to mysterious problems on mac.

chrome/test/automation/tab_proxy.h

Index: chrome/test/automation/tab_proxy.h
diff --git a/chrome/test/automation/tab_proxy.h b/chrome/test/automation/tab_proxy.h
index c4b1ee764d43aa572e8bcdbf738010de4f2f8060..92a80a76e69eef5d51dc2d0e01f7f6589f10457f 100644
--- a/chrome/test/automation/tab_proxy.h
+++ b/chrome/test/automation/tab_proxy.h
@@ -18,9 +18,9 @@
 #include "base/compiler_specific.h"
 #include "base/observer_list.h"
 #include "chrome/browser/download/save_package.h"
-#include "chrome/common/automation_constants.h"
-#include "chrome/common/page_type.h"
-#include "chrome/common/security_style.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
+#include "chrome/browser/tab_contents/security_style.h"
+#include "chrome/test/automation/automation_constants.h"
 #include "chrome/test/automation/automation_handle_tracker.h"
 #include "chrome/test/automation/dom_element_proxy.h"
 #include "chrome/test/automation/javascript_execution_controller.h"
@@ -323,7 +323,7 @@ class TabProxy : public AutomationResourceProxy,
 
   // Returns the type of the page currently showing (normal, interstitial,
   // error).
-  bool GetPageType(PageType* page_type) WARN_UNUSED_RESULT;
+  bool GetPageType(NavigationEntry::PageType* page_type) WARN_UNUSED_RESULT;
 
   // Simulates the user action on the SSL blocking page.  if |proceed| is true,
   // this is equivalent to clicking the 'Proceed' button, if false to 'Take me