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

chrome_frame/test/chrome_frame_automation_mock.h

Index: chrome_frame/test/chrome_frame_automation_mock.h
===================================================================
--- chrome_frame/test/chrome_frame_automation_mock.h	(revision 42377)
+++ chrome_frame/test/chrome_frame_automation_mock.h	(working copy)
@@ -20,23 +20,13 @@
   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()) {
@@ -140,8 +130,7 @@
   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();
@@ -158,8 +147,7 @@
   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);
@@ -173,7 +161,7 @@
   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_;
@@ -201,7 +189,7 @@
   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);