| Index: chrome_frame/test/automation_client_mock.cc
|
| ===================================================================
|
| --- chrome_frame/test/automation_client_mock.cc (revision 115109)
|
| +++ chrome_frame/test/automation_client_mock.cc (working copy)
|
| @@ -106,7 +106,7 @@
|
|
|
| GURL empty;
|
| scoped_refptr<ChromeFrameLaunchParams> clp(new ChromeFrameLaunchParams(
|
| - empty, empty, profile_path, profile_path.BaseName().value(), L"", L"",
|
| + empty, empty, profile_path, profile_path.BaseName().value(), L"",
|
| false, false, false));
|
| clp->set_launch_timeout(timeout);
|
| clp->set_version_check(false);
|
| @@ -138,7 +138,7 @@
|
|
|
| GURL empty;
|
| scoped_refptr<ChromeFrameLaunchParams> clp(new ChromeFrameLaunchParams(
|
| - empty, empty, profile_path, profile_path.BaseName().value(), L"", L"",
|
| + empty, empty, profile_path, profile_path.BaseName().value(), L"",
|
| false, false, false));
|
| clp->set_launch_timeout(timeout);
|
| clp->set_version_check(false);
|
| @@ -187,7 +187,7 @@
|
|
|
| GURL empty;
|
| scoped_refptr<ChromeFrameLaunchParams> clp(new ChromeFrameLaunchParams(
|
| - empty, empty, profile_path, profile_path.BaseName().value(), L"", L"",
|
| + empty, empty, profile_path, profile_path.BaseName().value(), L"",
|
| false, false, false));
|
| clp->set_launch_timeout(timeout);
|
| clp->set_version_check(false);
|
| @@ -234,7 +234,7 @@
|
|
|
| GURL empty;
|
| scoped_refptr<ChromeFrameLaunchParams> clp(new ChromeFrameLaunchParams(
|
| - empty, empty, profile_path, profile_path.BaseName().value(), L"", L"",
|
| + empty, empty, profile_path, profile_path.BaseName().value(), L"",
|
| false, false, false));
|
| clp->set_launch_timeout(10000);
|
| clp->set_version_check(false);
|
| @@ -272,7 +272,7 @@
|
| // Here we go!
|
| GURL empty;
|
| scoped_refptr<ChromeFrameLaunchParams> clp(new ChromeFrameLaunchParams(
|
| - empty, empty, profile_path_, profile_path_.BaseName().value(), L"", L"",
|
| + empty, empty, profile_path_, profile_path_.BaseName().value(), L"",
|
| false, false, false));
|
| clp->set_launch_timeout(timeout);
|
| clp->set_version_check(false);
|
| @@ -305,7 +305,7 @@
|
| // Here we go!
|
| GURL empty;
|
| scoped_refptr<ChromeFrameLaunchParams> clp(new ChromeFrameLaunchParams(
|
| - empty, empty, profile_path_, profile_path_.BaseName().value(), L"", L"",
|
| + empty, empty, profile_path_, profile_path_.BaseName().value(), L"",
|
| false, false, false));
|
| clp->set_launch_timeout(timeout_);
|
| clp->set_version_check(false);
|
| @@ -346,7 +346,7 @@
|
|
|
| GURL empty;
|
| scoped_refptr<ChromeFrameLaunchParams> clp(new ChromeFrameLaunchParams(
|
| - empty, empty, profile_path_, profile_path_.BaseName().value(), L"", L"",
|
| + empty, empty, profile_path_, profile_path_.BaseName().value(), L"",
|
| false, false, false));
|
| clp->set_launch_timeout(1); // Unneeded timeout, but can't be 0.
|
| clp->set_version_check(false);
|
| @@ -467,7 +467,7 @@
|
| scoped_refptr<ChromeFrameLaunchParams> launch_params(
|
| new ChromeFrameLaunchParams(
|
| GURL("http://www.nonexistent.com"), empty, profile_path_,
|
| - profile_path_.BaseName().value(), L"", L"", 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));
|
|
|