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

chrome/test/automation/tab_proxy.cc

Index: chrome/test/automation/tab_proxy.cc
diff --git a/chrome/test/automation/tab_proxy.cc b/chrome/test/automation/tab_proxy.cc
index fbd837c8470af6440884d0642e8cba6840f79d81..a338de706db385941dd176fdf2861756cc014c85 100644
--- a/chrome/test/automation/tab_proxy.cc
+++ b/chrome/test/automation/tab_proxy.cc
@@ -9,8 +9,9 @@
 #include "base/logging.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/common/automation_messages.h"
 #include "chrome/common/json_value_serializer.h"
+#include "chrome/test/automation/automation_constants.h"
+#include "chrome/test/automation/automation_messages.h"
 #include "chrome/test/automation/automation_proxy.h"
 #include "googleurl/src/gurl.h"
 
@@ -605,7 +606,7 @@ bool TabProxy::GetSecurityState(SecurityStyle* security_style,
   return succeeded;
 }
 
-bool TabProxy::GetPageType(PageType* type) {
+bool TabProxy::GetPageType(NavigationEntry::PageType* type) {
   DCHECK(type);
 
   if (!is_valid())