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

chrome/browser/automation/testing_automation_provider.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/automation/testing_automation_provider.h"
 
 #include "app/message_box_flags.h"
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 47 matching lines @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/net/url_request_context_getter.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/browser/notifications/balloon.h"
 #include "chrome/browser/notifications/balloon_collection.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
-#include "chrome/common/automation_messages.h"
+#include "chrome/test/automation/automation_messages.h"
 #include "net/base/cookie_store.h"
 #include "net/url_request/url_request_context.h"
 #include "views/event.h"
 #include "webkit/glue/plugins/plugin_list.h"
 
 namespace {
 
 class GetCookiesTask : public Task {
  public:
   GetCookiesTask(const GURL& url,
@@ skipping 1266 matching lines @@
     *success = false;
     *security_style = SECURITY_STYLE_UNKNOWN;
     *ssl_cert_status = 0;
     *insecure_content_status = 0;
   }
 }
 
 void TestingAutomationProvider::GetPageType(
     int handle,
     bool* success,
-    PageType* page_type) {
+    NavigationEntry::PageType* page_type) {
   if (tab_tracker_->ContainsHandle(handle)) {
     NavigationController* tab = tab_tracker_->GetResource(handle);
     NavigationEntry* entry = tab->GetActiveEntry();
     *page_type = entry->page_type();
     *success = true;
     // In order to return the proper result when an interstitial is shown and
     // no navigation entry were created for it we need to ask the TabContents.
-    if (*page_type == NORMAL_PAGE &&
+    if (*page_type == NavigationEntry::NORMAL_PAGE &&
         tab->tab_contents()->showing_interstitial_page())
-      *page_type = INTERSTITIAL_PAGE;
+      *page_type = NavigationEntry::INTERSTITIAL_PAGE;
   } else {
     *success = false;
-    *page_type = NORMAL_PAGE;
+    *page_type = NavigationEntry::NORMAL_PAGE;
   }
 }
 
 void TestingAutomationProvider::GetMetricEventDuration(
     const std::string& event_name,
     int* duration_ms) {
   *duration_ms = metric_event_duration_observer_->GetEventDurationMs(
       event_name);
 }
 
 void TestingAutomationProvider::ActionOnSSLBlockingPage(
     int handle,
     bool proceed,
     IPC::Message* reply_message) {
   if (tab_tracker_->ContainsHandle(handle)) {
     NavigationController* tab = tab_tracker_->GetResource(handle);
     NavigationEntry* entry = tab->GetActiveEntry();
-    if (entry->page_type() == INTERSTITIAL_PAGE) {
+    if (entry->page_type() == NavigationEntry::INTERSTITIAL_PAGE) {
       TabContents* tab_contents = tab->tab_contents();
       InterstitialPage* ssl_blocking_page =
           InterstitialPage::GetInterstitialPage(tab_contents);
       if (ssl_blocking_page) {
         if (proceed) {
           AddNavigationStatusListener(tab, reply_message, 1, false);
           ssl_blocking_page->Proceed();
           return;
         }
         ssl_blocking_page->DontProceed();
@@ skipping 1054 matching lines @@
 
   NavigationEntry::SSLStatus ssl_status = nav_entry->ssl();
   ssl->SetString("security_style",
                  style_to_string[ssl_status.security_style()]);
   ssl->SetBoolean("ran_insecure_content", ssl_status.ran_insecure_content());
   ssl->SetBoolean("displayed_insecure_content",
                   ssl_status.displayed_insecure_content());
   return_value->Set("ssl", ssl);
 
   // Page type.
-  std::map<PageType, std::string> pagetype_to_string;
-  pagetype_to_string[NORMAL_PAGE] = "NORMAL_PAGE";
-  pagetype_to_string[ERROR_PAGE] = "ERROR_PAGE";
-  pagetype_to_string[INTERSTITIAL_PAGE] = "INTERSTITIAL_PAGE";
+  std::map<NavigationEntry::PageType, std::string> pagetype_to_string;
+  pagetype_to_string[NavigationEntry::NORMAL_PAGE] = "NORMAL_PAGE";
+  pagetype_to_string[NavigationEntry::ERROR_PAGE] = "ERROR_PAGE";
+  pagetype_to_string[NavigationEntry::INTERSTITIAL_PAGE] = "INTERSTITIAL_PAGE";
   return_value->SetString("page_type",
                           pagetype_to_string[nav_entry->page_type()]);
 
   return_value->SetString("favicon_url", nav_entry->favicon().url().spec());
   reply.SendSuccess(return_value.get());
 }
 
 // Sample json input: { "command": "GetHistoryInfo",
 //                      "search_text": "some text" }
 // Refer chrome/test/pyautolib/history_info.py for sample json output.
@@ skipping 1736 matching lines @@
   DCHECK(type == NotificationType::SESSION_END);
   // OnBrowserRemoved does a ReleaseLater. When session end is received we exit
   // before the task runs resulting in this object not being deleted. This
   // Release balance out the Release scheduled by OnBrowserRemoved.
   Release();
 }
 
 void TestingAutomationProvider::OnRemoveProvider() {
   AutomationProviderList::GetInstance()->RemoveProvider(this);
 }