Part 3 of reapplying r64637.

chrome/browser/automation/testing_automation_provider.cc

Index: chrome/browser/automation/testing_automation_provider.cc
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
index 1b8b5b9d7e5dac4a68f4c16a57261fc398252469..3dc5f6cd96ba5f8fd5afee9f837a010dfecee426 100644
--- a/chrome/browser/automation/testing_automation_provider.cc
+++ b/chrome/browser/automation/testing_automation_provider.cc
@@ -1354,7 +1354,7 @@ void TestingAutomationProvider::GetSecurityState(int handle,
 void TestingAutomationProvider::GetPageType(
     int handle,
     bool* success,
-    NavigationEntry::PageType* page_type) {
+    PageType* page_type) {
   if (tab_tracker_->ContainsHandle(handle)) {
     NavigationController* tab = tab_tracker_->GetResource(handle);
     NavigationEntry* entry = tab->GetActiveEntry();
@@ -1362,12 +1362,12 @@ void TestingAutomationProvider::GetPageType(
     *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 == NavigationEntry::NORMAL_PAGE &&
+    if (*page_type == NORMAL_PAGE &&
         tab->tab_contents()->showing_interstitial_page())
-      *page_type = NavigationEntry::INTERSTITIAL_PAGE;
+      *page_type = INTERSTITIAL_PAGE;
   } else {
     *success = false;
-    *page_type = NavigationEntry::NORMAL_PAGE;
+    *page_type = NORMAL_PAGE;
   }
 }
 
@@ -1385,7 +1385,7 @@ void TestingAutomationProvider::ActionOnSSLBlockingPage(
   if (tab_tracker_->ContainsHandle(handle)) {
     NavigationController* tab = tab_tracker_->GetResource(handle);
     NavigationEntry* entry = tab->GetActiveEntry();
-    if (entry->page_type() == NavigationEntry::INTERSTITIAL_PAGE) {
+    if (entry->page_type() == INTERSTITIAL_PAGE) {
       TabContents* tab_contents = tab->tab_contents();
       InterstitialPage* ssl_blocking_page =
           InterstitialPage::GetInterstitialPage(tab_contents);
@@ -2469,10 +2469,10 @@ void TestingAutomationProvider::GetNavigationInfo(
   return_value->Set("ssl", ssl);
 
   // Page type.
-  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";
+  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";
   return_value->SetString("page_type",
                           pagetype_to_string[nav_entry->page_type()]);