Part 3 of reapplying r64637.

chrome/common/automation_messages.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_COMMON_AUTOMATION_MESSAGES_H__
 #define CHROME_COMMON_AUTOMATION_MESSAGES_H__
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "chrome/common/automation_constants.h"
 #include "chrome/common/common_param_traits.h"
-#include "chrome/browser/tab_contents/navigation_entry.h"
-#include "chrome/browser/tab_contents/security_style.h"
+#include "chrome/common/page_type.h"
+#include "chrome/common/security_style.h"
+#include "chrome/common/common_param_traits.h"
 #include "gfx/rect.h"
 #include "net/base/upload_data.h"
 
 struct AutomationMsg_Find_Params {
   // Unused value, which exists only for backwards compat.
   int unused;
 
   // The word(s) to find on the page.
   string16 search_string;
 
@@ skipping 165 matching lines @@
      default:
       control = "UNKNOWN";
       break;
     }
 
     LogParam(control, l);
   }
 };
 
 template <>
-struct ParamTraits<NavigationEntry::PageType> {
-  typedef NavigationEntry::PageType param_type;
+struct ParamTraits<PageType> {
+  typedef PageType param_type;
   static void Write(Message* m, const param_type& p) {
     m->WriteInt(p);
   }
   static bool Read(const Message* m, void** iter, param_type* p) {
     int type;
     if (!m->ReadInt(iter, &type))
       return false;
-    *p = static_cast<NavigationEntry::PageType>(type);
+    *p = static_cast<PageType>(type);
     return true;
   }
   static void Log(const param_type& p, std::string* l) {
     std::string control;
     switch (p) {
-     case NavigationEntry::NORMAL_PAGE:
+     case NORMAL_PAGE:
       control = "NORMAL_PAGE";
       break;
-     case NavigationEntry::ERROR_PAGE:
+     case ERROR_PAGE:
       control = "ERROR_PAGE";
       break;
-     case NavigationEntry::INTERSTITIAL_PAGE:
+     case INTERSTITIAL_PAGE:
       control = "INTERSTITIAL_PAGE";
       break;
      default:
       control = "UNKNOWN";
       break;
     }
 
     LogParam(control, l);
   }
 };
@@ skipping 402 matching lines @@
   }
 };
 
 }  // namespace IPC
 
 #define MESSAGES_INTERNAL_FILE \
     "chrome/common/automation_messages_internal.h"
 #include "ipc/ipc_message_macros.h"
 
 #endif  // CHROME_COMMON_AUTOMATION_MESSAGES_H__