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

chrome/browser/tab_contents/navigation_entry_unittest.cc

Index: chrome/browser/tab_contents/navigation_entry_unittest.cc
diff --git a/chrome/browser/tab_contents/navigation_entry_unittest.cc b/chrome/browser/tab_contents/navigation_entry_unittest.cc
index e28cf1c29577d5a1ed5f610ede4fa9aca39f09d9..db59464361e45884ec158c2dac0274df45259945 100644
--- a/chrome/browser/tab_contents/navigation_entry_unittest.cc
+++ b/chrome/browser/tab_contents/navigation_entry_unittest.cc
@@ -134,10 +134,10 @@ TEST_F(NavigationEntryTest, NavigationEntryAccessors) {
   EXPECT_EQ(instance_, entry1_.get()->site_instance());
 
   // Page type
-  EXPECT_EQ(NORMAL_PAGE, entry1_.get()->page_type());
-  EXPECT_EQ(NORMAL_PAGE, entry2_.get()->page_type());
-  entry2_.get()->set_page_type(INTERSTITIAL_PAGE);
-  EXPECT_EQ(INTERSTITIAL_PAGE, entry2_.get()->page_type());
+  EXPECT_EQ(NavigationEntry::NORMAL_PAGE, entry1_.get()->page_type());
+  EXPECT_EQ(NavigationEntry::NORMAL_PAGE, entry2_.get()->page_type());
+  entry2_.get()->set_page_type(NavigationEntry::INTERSTITIAL_PAGE);
+  EXPECT_EQ(NavigationEntry::INTERSTITIAL_PAGE, entry2_.get()->page_type());
 
   // Referrer
   EXPECT_EQ(GURL(), entry1_.get()->referrer());