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

chrome/browser/tab_contents/navigation_entry.h

 // 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.
 
 #ifndef CHROME_BROWSER_TAB_CONTENTS_NAVIGATION_ENTRY_H_
 #define CHROME_BROWSER_TAB_CONTENTS_NAVIGATION_ENTRY_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/ref_counted.h"
-#include "chrome/common/page_type.h"
+#include "chrome/browser/tab_contents/security_style.h"
 #include "chrome/common/page_transition_types.h"
-#include "chrome/common/security_style.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 class NavigationController;
 class SiteInstance;
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // NavigationEntry class
 //
@@ skipping 100 matching lines @@
     SecurityStyle security_style_;
     int cert_id_;
     int cert_status_;
     int security_bits_;
     int connection_status_;
     int content_status_;
 
     // Copy and assignment is explicitly allowed for this class.
   };
 
+  // The type of the page an entry corresponds to.  Used by tests.
+  enum PageType {
+    NORMAL_PAGE = 0,
+    ERROR_PAGE,
+    INTERSTITIAL_PAGE
+  };
+
   // Favicon -------------------------------------------------------------------
 
   // Collects the favicon related information for a NavigationEntry.
   class FaviconStatus {
    public:
     FaviconStatus();
 
     // Indicates whether we've gotten an official favicon for the page, or are
     // just using the default favicon.
     void set_is_valid(bool is_valid) {
@@ skipping 277 matching lines @@
   // This is a cached version of the result of GetTitleForDisplay. It prevents
   // us from having to do URL formatting on the URL evey time the title is
   // displayed. When the URL, virtual URL, or title is set, this should be
   // cleared to force a refresh.
   string16 cached_display_title_;
 
   // Copy and assignment is explicitly allowed for this class.
 };
 
 #endif  // CHROME_BROWSER_TAB_CONTENTS_NAVIGATION_ENTRY_H_