| Index: chrome_frame/test/automation_client_mock.cc
|
| ===================================================================
|
| --- chrome_frame/test/automation_client_mock.cc (revision 60826)
|
| +++ chrome_frame/test/automation_client_mock.cc (working copy)
|
| @@ -105,7 +105,7 @@
|
| GURL empty;
|
| scoped_refptr<ChromeFrameLaunchParams> clp(new ChromeFrameLaunchParams(
|
| empty, empty, profile_path, profile_path.BaseName().value(), L"",
|
| - false, false));
|
| + false, false, false));
|
| clp->set_launch_timeout(timeout);
|
| clp->set_version_check(false);
|
| EXPECT_TRUE(client->Initialize(&cfd, clp));
|
| @@ -137,7 +137,7 @@
|
| GURL empty;
|
| scoped_refptr<ChromeFrameLaunchParams> clp(new ChromeFrameLaunchParams(
|
| empty, empty, profile_path, profile_path.BaseName().value(), L"",
|
| - false, false));
|
| + false, false, false));
|
| clp->set_launch_timeout(timeout);
|
| clp->set_version_check(false);
|
| EXPECT_TRUE(client->Initialize(&cfd, clp));
|
| @@ -183,7 +183,7 @@
|
| GURL empty;
|
| scoped_refptr<ChromeFrameLaunchParams> clp(new ChromeFrameLaunchParams(
|
| empty, empty, profile_path, profile_path.BaseName().value(), L"",
|
| - false, false));
|
| + false, false, false));
|
| clp->set_launch_timeout(timeout);
|
| clp->set_version_check(false);
|
| EXPECT_TRUE(client->Initialize(&cfd, clp));
|
| @@ -229,7 +229,7 @@
|
| GURL empty;
|
| scoped_refptr<ChromeFrameLaunchParams> clp(new ChromeFrameLaunchParams(
|
| empty, empty, profile_path, profile_path.BaseName().value(), L"",
|
| - false, false));
|
| + false, false, false));
|
| clp->set_launch_timeout(10000);
|
| clp->set_version_check(false);
|
| EXPECT_TRUE(client->Initialize(&cfd, clp));
|
| @@ -267,7 +267,7 @@
|
| GURL empty;
|
| scoped_refptr<ChromeFrameLaunchParams> clp(new ChromeFrameLaunchParams(
|
| empty, empty, profile_path_, profile_path_.BaseName().value(), L"",
|
| - false, false));
|
| + false, false, false));
|
| clp->set_launch_timeout(timeout);
|
| clp->set_version_check(false);
|
| EXPECT_TRUE(client_->Initialize(&cfd_, clp));
|
| @@ -299,7 +299,7 @@
|
| GURL empty;
|
| scoped_refptr<ChromeFrameLaunchParams> clp(new ChromeFrameLaunchParams(
|
| empty, empty, profile_path_, profile_path_.BaseName().value(), L"",
|
| - false, false));
|
| + false, false, false));
|
| clp->set_launch_timeout(timeout_);
|
| clp->set_version_check(false);
|
| EXPECT_TRUE(client_->Initialize(&cfd_, clp));
|
| @@ -339,7 +339,7 @@
|
| GURL empty;
|
| scoped_refptr<ChromeFrameLaunchParams> clp(new ChromeFrameLaunchParams(
|
| empty, empty, profile_path_, profile_path_.BaseName().value(), L"",
|
| - false, false));
|
| + false, false, false));
|
| clp->set_launch_timeout(1); // Unneeded timeout, but can't be 0.
|
| clp->set_version_check(false);
|
|
|
| @@ -457,7 +457,7 @@
|
| scoped_refptr<ChromeFrameLaunchParams> launch_params(
|
| new ChromeFrameLaunchParams(
|
| GURL("http://www.nonexistent.com"), empty, profile_path_,
|
| - profile_path_.BaseName().value(), L"", 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));
|
|
|