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

chrome/browser/tab_contents/navigation_controller_unittest.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 "base/file_util.h"
 #include "base/path_service.h"
 #include "base/scoped_ptr.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 1356 matching lines @@
 // Make sure that the page type and stuff is correct after an interstitial.
 TEST_F(NavigationControllerTest, Interstitial) {
   // First navigate somewhere normal.
   const GURL url1("http://foo");
   controller().LoadURL(url1, GURL(), PageTransition::TYPED);
   rvh()->SendNavigate(0, url1);
 
   // Now navigate somewhere with an interstitial.
   const GURL url2("http://bar");
   controller().LoadURL(url1, GURL(), PageTransition::TYPED);
-  controller().pending_entry()->set_page_type(INTERSTITIAL_PAGE);
+  controller().pending_entry()->set_page_type(
+      NavigationEntry::INTERSTITIAL_PAGE);
 
   // At this point the interstitial will be displayed and the load will still
   // be pending. If the user continues, the load will commit.
   rvh()->SendNavigate(1, url2);
 
   // The page should be a normal page again.
   EXPECT_EQ(url2, controller().GetLastCommittedEntry()->url());
-  EXPECT_EQ(NORMAL_PAGE, controller().GetLastCommittedEntry()->page_type());
+  EXPECT_EQ(NavigationEntry::NORMAL_PAGE,
+            controller().GetLastCommittedEntry()->page_type());
 }
 
 TEST_F(NavigationControllerTest, RemoveEntry) {
   const GURL url1("http://foo1");
   const GURL url2("http://foo2");
   const GURL url3("http://foo3");
   const GURL url4("http://foo4");
   const GURL url5("http://foo5");
   const GURL pending_url("http://pending");
   const GURL default_url("http://default");
@@ skipping 269 matching lines @@
 // Make sure that cloning a tabcontents doesn't copy interstitials.
 TEST_F(NavigationControllerTest, CloneOmitsInterstitials) {
   const GURL url1("http://foo1");
   const GURL url2("http://foo2");
 
   NavigateAndCommit(url1);
   NavigateAndCommit(url2);
 
   // Add an interstitial entry.  Should be deleted with controller.
   NavigationEntry* interstitial_entry = new NavigationEntry();
-  interstitial_entry->set_page_type(INTERSTITIAL_PAGE);
+  interstitial_entry->set_page_type(NavigationEntry::INTERSTITIAL_PAGE);
   controller().AddTransientEntry(interstitial_entry);
 
   scoped_ptr<TabContents> clone(controller().tab_contents()->Clone());
 
   ASSERT_EQ(2, clone->controller().entry_count());
 }
 
 // Tests a subframe navigation while a toplevel navigation is pending.
 // http://crbug.com/43967
 TEST_F(NavigationControllerTest, SubframeWhilePending) {
@@ skipping 254 matching lines @@
                     PageTransition::LINK);
   session_helper_.AssertNavigationEquals(nav,
                                          windows_[0]->tabs[0]->navigations[0]);
   nav.set_url(url2);
   session_helper_.AssertNavigationEquals(nav,
                                          windows_[0]->tabs[0]->navigations[1]);
 }
 */
 
 }  // namespace