Revert 42366 - Allow TabContentsDelegate classes to specify whether InfoBars ...

chrome_frame/test/chrome_frame_automation_mock.h

 // Copyright (c) 2006-2009 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_FRAME_TEST_CHROME_FRAME_AUTOMATION_MOCK_H_
 #define CHROME_FRAME_TEST_CHROME_FRAME_AUTOMATION_MOCK_H_
 
 #include <string>
 
 #include "base/file_path.h"
 #include "base/path_service.h"
 #include "chrome_frame/chrome_frame_automation.h"
 #include "chrome_frame/chrome_frame_plugin.h"
 #include "chrome_frame/test/http_server.h"
 
 template <typename T>
 class AutomationMockDelegate
     : public CWindowImpl<T>,
       public ChromeFramePlugin<T> {
  public:
   AutomationMockDelegate(MessageLoop* caller_message_loop,
       int launch_timeout, bool perform_version_check,
       const std::wstring& profile_name,
-      const std::wstring& extra_chrome_arguments, bool incognito,
-      bool is_widget_mode)
+      const std::wstring& extra_chrome_arguments, bool incognito)
       : caller_message_loop_(caller_message_loop), is_connected_(false),
         navigation_result_(false) {
     test_server_.SetUp();
     automation_client_ = new ChromeFrameAutomationClient;
-    ChromeFrameLaunchParams cfp = {
-      launch_timeout,
-      GURL(),
-      GURL(),
-      profile_name,
-      extra_chrome_arguments,
-      perform_version_check,
-      incognito,
-      is_widget_mode
-    };
-    automation_client_->Initialize(this, cfp);
+    automation_client_->Initialize(this, launch_timeout, perform_version_check,
+        profile_name, extra_chrome_arguments, incognito);
   }
   ~AutomationMockDelegate() {
     if (automation_client_.get()) {
       automation_client_->Uninitialize();
       automation_client_ = NULL;
     }
     if (IsWindow())
       DestroyWindow();
 
     test_server_.TearDown();
@@ skipping 83 matching lines @@
   bool is_connected_;
   bool navigation_result_;
 };
 
 class AutomationMockLaunch
     : public AutomationMockDelegate<AutomationMockLaunch> {
  public:
   typedef AutomationMockDelegate<AutomationMockLaunch> Base;
   AutomationMockLaunch(MessageLoop* caller_message_loop,
                        int launch_timeout)
-      : Base(caller_message_loop, launch_timeout, true, L"", L"", false,
-             false) {
+      : Base(caller_message_loop, launch_timeout, true, L"", L"", false) {
   }
   virtual void OnAutomationServerReady() {
     Base::OnAutomationServerReady();
     QuitMessageLoop();
   }
   bool launch_result() const {
     return is_connected();
   }
 };
 
 class AutomationMockNavigate
     : public AutomationMockDelegate<AutomationMockNavigate> {
  public:
   typedef AutomationMockDelegate<AutomationMockNavigate> Base;
   AutomationMockNavigate(MessageLoop* caller_message_loop,
                          int launch_timeout)
-      : Base(caller_message_loop, launch_timeout, true, L"", L"", false,
-             false) {
+      : Base(caller_message_loop, launch_timeout, true, L"", L"", false) {
   }
   virtual void OnLoad(int tab_handle, const GURL& url) {
     Base::OnLoad(tab_handle, url);
     QuitMessageLoop();
   }
 };
 
 class AutomationMockPostMessage
     : public AutomationMockDelegate<AutomationMockPostMessage> {
  public:
   typedef AutomationMockDelegate<AutomationMockPostMessage> Base;
   AutomationMockPostMessage(MessageLoop* caller_message_loop,
                             int launch_timeout)
-      : Base(caller_message_loop, launch_timeout, true, L"", L"", false, false),
+      : Base(caller_message_loop, launch_timeout, true, L"", L"", false),
         postmessage_result_(false) {}
   bool postmessage_result() const {
     return postmessage_result_;
   }
   virtual void OnLoad(int tab_handle, const GURL& url) {
     Base::OnLoad(tab_handle, url);
     if (navigation_result()) {
       automation()->ForwardMessageFromExternalHost("Test", "null", "*");
     }
   }
   virtual void OnMessageFromChromeFrame(int tab_handle,
                                         const std::string& message,
                                         const std::string& origin,
                                         const std::string& target) {
     postmessage_result_ = true;
     QuitMessageLoop();
   }
  private:
   bool postmessage_result_;
 };
 
 class AutomationMockHostNetworkRequestStart
     : public AutomationMockDelegate<AutomationMockHostNetworkRequestStart> {
  public:
   typedef AutomationMockDelegate<AutomationMockHostNetworkRequestStart> Base;
   AutomationMockHostNetworkRequestStart(MessageLoop* caller_message_loop,
       int launch_timeout)
-      : Base(caller_message_loop, launch_timeout, true, L"", L"", false, false),
+      : Base(caller_message_loop, launch_timeout, true, L"", L"", false),
         request_start_result_(false) {
     if (automation()) {
       automation()->set_use_chrome_network(false);
     }
   }
   bool request_start_result() const {
     return request_start_result_;
   }
   virtual void OnRequestStart(int tab_handle, int request_id,
                               const IPC::AutomationURLRequest& request) {
     request_start_result_ = true;
     QuitMessageLoop();
   }
   virtual void OnLoad(int tab_handle, const GURL& url) {
     Base::OnLoad(tab_handle, url);
   }
  private:
   bool request_start_result_;
 };
 
 
 #endif  // CHROME_FRAME_TEST_CHROME_FRAME_AUTOMATION_MOCK_H_