Refactor automation messages.

chrome/test/automation/tab_proxy.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_TEST_AUTOMATION_TAB_PROXY_H_
 #define CHROME_TEST_AUTOMATION_TAB_PROXY_H_
 #pragma once
 
 #include "build/build_config.h"  // NOLINT
 
 #if defined(OS_WIN)
 #include <wtypes.h>  // NOLINT
 #endif
 
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/observer_list.h"
 #include "chrome/browser/download/save_package.h"
-#include "chrome/browser/tab_contents/navigation_entry.h"
-#include "chrome/browser/tab_contents/security_style.h"
-#include "chrome/test/automation/automation_constants.h"
+#include "chrome/common/automation_constants.h"
+#include "chrome/common/page_type.h"
+#include "chrome/common/security_style.h"
 #include "chrome/test/automation/automation_handle_tracker.h"
 #include "chrome/test/automation/dom_element_proxy.h"
 #include "chrome/test/automation/javascript_execution_controller.h"
 
 class GURL;
 class Value;
 namespace IPC {
 class Message;
 };
 
@@ skipping 282 matching lines @@
   // timeout_ms gives the max amount of time to wait for restore to complete.
   bool WaitForTabToBeRestored(uint32 timeout_ms) WARN_UNUSED_RESULT;
 
   // Retrieves the different security states for the current tab.
   bool GetSecurityState(SecurityStyle* security_style,
                         int* ssl_cert_status,
                         int* insecure_content_status) WARN_UNUSED_RESULT;
 
   // Returns the type of the page currently showing (normal, interstitial,
   // error).
-  bool GetPageType(NavigationEntry::PageType* page_type) WARN_UNUSED_RESULT;
+  bool GetPageType(PageType* page_type) WARN_UNUSED_RESULT;
 
   // Simulates the user action on the SSL blocking page.  if |proceed| is true,
   // this is equivalent to clicking the 'Proceed' button, if false to 'Take me
   // out of there' button.
   bool TakeActionOnSSLBlockingPage(bool proceed) WARN_UNUSED_RESULT;
 
   // Prints the current page without user intervention.
   bool PrintNow() WARN_UNUSED_RESULT;
 
   // Sends off an asynchronous request for printing.
@@ skipping 90 matching lines @@
   // purposes.
   void LastObjectRemoved();
 
  private:
   Lock list_lock_;  // Protects the observers_list_.
   ObserverList<TabProxyDelegate> observers_list_;
   DISALLOW_COPY_AND_ASSIGN(TabProxy);
 };
 
 #endif  // CHROME_TEST_AUTOMATION_TAB_PROXY_H_