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

chrome/browser/tab_contents/navigation_entry_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/string16.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/renderer_host/site_instance.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 116 matching lines @@
 
 // Test other basic accessors
 TEST_F(NavigationEntryTest, NavigationEntryAccessors) {
   // SiteInstance
   EXPECT_TRUE(entry1_.get()->site_instance() == NULL);
   EXPECT_EQ(instance_, entry2_.get()->site_instance());
   entry1_.get()->set_site_instance(instance_);
   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());
   EXPECT_EQ(GURL("from"), entry2_.get()->referrer());
   entry2_.get()->set_referrer(GURL("from2"));
   EXPECT_EQ(GURL("from2"), entry2_.get()->referrer());
 
   // Title
   EXPECT_EQ(string16(), entry1_.get()->title());
   EXPECT_EQ(ASCIIToUTF16("title"), entry2_.get()->title());
@@ skipping 23 matching lines @@
   EXPECT_FALSE(entry2_.get()->has_post_data());
   entry2_.get()->set_has_post_data(true);
   EXPECT_TRUE(entry2_.get()->has_post_data());
 
   // Restored
   EXPECT_EQ(NavigationEntry::RESTORE_NONE, entry1_->restore_type());
   EXPECT_EQ(NavigationEntry::RESTORE_NONE, entry2_->restore_type());
   entry2_->set_restore_type(NavigationEntry::RESTORE_LAST_SESSION);
   EXPECT_EQ(NavigationEntry::RESTORE_LAST_SESSION, entry2_->restore_type());
 }