Remove Chrome Frame's delay shutdown field trial.

chrome_frame/test/automation_client_mock.cc

 // Copyright (c) 2012 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.
 
 #include "chrome_frame/test/automation_client_mock.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "chrome/common/automation_messages.h"
 #include "chrome_frame/custom_sync_call_context.h"
@@ skipping 119 matching lines @@
 void CFACWithChrome::TearDownTestCase() {
   profile_path_.clear();
 }
 
 void CFACWithChrome::SetUp() {
   chrome_frame_test::OverrideDataDirectoryForThisTest(profile_path_.value());
   client_ = new ChromeFrameAutomationClient();
   GURL empty;
   launch_params_ = new ChromeFrameLaunchParams(
       empty, empty, profile_path_, profile_path_.BaseName().value(), L"",
-      false, false, false, false);
+      false, false, false);
   launch_params_->set_version_check(false);
   launch_params_->set_launch_timeout(kSaneAutomationTimeoutMs);
 }
 
 void CFACWithChrome::TearDown() {
   client_->Uninitialize();
 }
 
 // We mock ChromeFrameDelegate only. The rest is with real AutomationProxy
 TEST_F(CFACWithChrome, CreateTooFast) {
@@ skipping 108 matching lines @@
 
   EXPECT_CALL(cfd_, OnAutomationServerReady())
       .WillOnce(QUIT_LOOP(loop_));
 
   EXPECT_CALL(mock_proxy_, CancelAsync(_)).Times(testing::AnyNumber());
 
   // Here we go!
   GURL empty;
   scoped_refptr<ChromeFrameLaunchParams> clp(new ChromeFrameLaunchParams(
       empty, empty, profile_path_, profile_path_.BaseName().value(), L"",
-      false, false, false, false));
+      false, false, false));
   clp->set_launch_timeout(timeout);
   clp->set_version_check(false);
   EXPECT_TRUE(client_->Initialize(&cfd_, clp));
   loop_.RunFor(base::TimeDelta::FromSeconds(10));
 
   EXPECT_CALL(mock_proxy_, ReleaseTabProxy(testing::Eq(tab_handle_))).Times(1);
   client_->Uninitialize();
 }
 
 TEST_F(CFACMockTest, MockedCreateTabFailed) {
@@ skipping 12 matching lines @@
   EXPECT_CALL(mock_proxy_, CreateTabProxy(_)).Times(0);
 
   EXPECT_CALL(mock_proxy_, CancelAsync(_)).Times(testing::AnyNumber());
 
   Set_CFD_LaunchFailed(AUTOMATION_CREATE_TAB_FAILED);
 
   // Here we go!
   GURL empty;
   scoped_refptr<ChromeFrameLaunchParams> clp(new ChromeFrameLaunchParams(
       empty, empty, profile_path_, profile_path_.BaseName().value(), L"",
-      false, false, false, false));
+      false, false, false));
   clp->set_launch_timeout(timeout_);
   clp->set_version_check(false);
   EXPECT_TRUE(client_->Initialize(&cfd_, clp));
   loop_.RunFor(base::TimeDelta::FromSeconds(4));
   client_->Uninitialize();
 }
 
 class TestChromeFrameAutomationProxyImpl
     : public ChromeFrameAutomationProxyImpl {
  public:
@@ skipping 23 matching lines @@
 }
 
 TEST_F(CFACMockTest, OnChannelError) {
   const base::TimeDelta loop_duration = base::TimeDelta::FromSeconds(11);
   TestChromeFrameAutomationProxyImpl proxy;
   returned_proxy_ = &proxy;
 
   GURL empty;
   scoped_refptr<ChromeFrameLaunchParams> clp(new ChromeFrameLaunchParams(
       empty, empty, profile_path_, profile_path_.BaseName().value(), L"",
-      false, false, false, false));
+      false, false, false));
   clp->set_launch_timeout(1);  // Unneeded timeout, but can't be 0.
   clp->set_version_check(false);
 
   HWND h1 = ::GetDesktopWindow();
   HWND h2 = ::GetDesktopWindow();
   EXPECT_CALL(proxy, SendAsAsync(testing::Property(
     &IPC::SyncMessage::type, AutomationMsg_CreateExternalTab::ID),
     testing::NotNull(), _)).Times(3)
         .WillOnce(HandleCreateTab(tab_handle_, h1, h2, 99))
         .WillOnce(HandleCreateTab(tab_handle_ * 2, h1, h2, 100))
@@ skipping 99 matching lines @@
           .Times(1)
           .WillOnce(Return(true));
 
   EXPECT_CALL(cfd_, GetBounds(_)).Times(1);
 
   // Here we go!
   GURL empty;
   scoped_refptr<ChromeFrameLaunchParams> launch_params(
       new ChromeFrameLaunchParams(
           GURL("http://www.nonexistent.com"), empty, profile_path_,
-          profile_path_.BaseName().value(), L"", false, false, false, false));
+          profile_path_.BaseName().value(), L"", false, false, false));
   launch_params->set_launch_timeout(timeout);
   launch_params->set_version_check(false);
   EXPECT_TRUE(client_->Initialize(&cfd_, launch_params));
   loop_.RunFor(base::TimeDelta::FromSeconds(10));
 
   EXPECT_CALL(mock_proxy_, ReleaseTabProxy(testing::Eq(tab_handle_))).Times(1);
   client_->Uninitialize();
 }