summaryrefslogtreecommitdiffstats
path: root/chrome_frame/test/automation_client_mock.cc
diff options
context:
space:
mode:
authorgrt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-20 14:01:21 +0000
committergrt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-20 14:01:21 +0000
commit6ae3d4909757757f27940369e1bdc67eebd52b87 (patch)
treeb95726d81214d6824646008e53d870d0ee8f2feb /chrome_frame/test/automation_client_mock.cc
parentb85e5120573c61b9bdd492fb903b334bf1119d8f (diff)
downloadchromium_src-6ae3d4909757757f27940369e1bdc67eebd52b87.zip
chromium_src-6ae3d4909757757f27940369e1bdc67eebd52b87.tar.gz
chromium_src-6ae3d4909757757f27940369e1bdc67eebd52b87.tar.bz2
Various changes to make GCF nicer for the non-en-US world:
- Chrome Frame now uses MUI on Vista+ to detect IE's UX language. - Chrome Frame now tells Chrome (via the --lang command-line option) what the current langauge is. - Chrome Frame now respects Chrome's "ApplicationLocaleValue" group policy setting. BUG=56435,59582 TEST=chrome_frame_unittests and chrome_frame_tests updated Review URL: http://codereview.chromium.org/3757007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63208 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/automation_client_mock.cc')
-rw-r--r--chrome_frame/test/automation_client_mock.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/chrome_frame/test/automation_client_mock.cc b/chrome_frame/test/automation_client_mock.cc
index 7626c0b..a77b023 100644
--- a/chrome_frame/test/automation_client_mock.cc
+++ b/chrome_frame/test/automation_client_mock.cc
@@ -104,7 +104,7 @@ TEST(CFACWithChrome, CreateTooFast) {
GURL empty;
scoped_refptr<ChromeFrameLaunchParams> clp(new ChromeFrameLaunchParams(
- empty, empty, profile_path, profile_path.BaseName().value(), L"",
+ empty, empty, profile_path, profile_path.BaseName().value(), L"", L"",
false, false, false));
clp->set_launch_timeout(timeout);
clp->set_version_check(false);
@@ -136,7 +136,7 @@ TEST(CFACWithChrome, CreateNotSoFast) {
GURL empty;
scoped_refptr<ChromeFrameLaunchParams> clp(new ChromeFrameLaunchParams(
- empty, empty, profile_path, profile_path.BaseName().value(), L"",
+ empty, empty, profile_path, profile_path.BaseName().value(), L"", L"",
false, false, false));
clp->set_launch_timeout(timeout);
clp->set_version_check(false);
@@ -182,7 +182,7 @@ TEST(CFACWithChrome, NavigateOk) {
GURL empty;
scoped_refptr<ChromeFrameLaunchParams> clp(new ChromeFrameLaunchParams(
- empty, empty, profile_path, profile_path.BaseName().value(), L"",
+ empty, empty, profile_path, profile_path.BaseName().value(), L"", L"",
false, false, false));
clp->set_launch_timeout(timeout);
clp->set_version_check(false);
@@ -228,7 +228,7 @@ TEST(CFACWithChrome, NavigateFailed) {
GURL empty;
scoped_refptr<ChromeFrameLaunchParams> clp(new ChromeFrameLaunchParams(
- empty, empty, profile_path, profile_path.BaseName().value(), L"",
+ empty, empty, profile_path, profile_path.BaseName().value(), L"", L"",
false, false, false));
clp->set_launch_timeout(10000);
clp->set_version_check(false);
@@ -266,7 +266,7 @@ TEST_F(CFACMockTest, MockedCreateTabOk) {
// Here we go!
GURL empty;
scoped_refptr<ChromeFrameLaunchParams> clp(new ChromeFrameLaunchParams(
- empty, empty, profile_path_, profile_path_.BaseName().value(), L"",
+ empty, empty, profile_path_, profile_path_.BaseName().value(), L"", L"",
false, false, false));
clp->set_launch_timeout(timeout);
clp->set_version_check(false);
@@ -298,7 +298,7 @@ TEST_F(CFACMockTest, MockedCreateTabFailed) {
// Here we go!
GURL empty;
scoped_refptr<ChromeFrameLaunchParams> clp(new ChromeFrameLaunchParams(
- empty, empty, profile_path_, profile_path_.BaseName().value(), L"",
+ empty, empty, profile_path_, profile_path_.BaseName().value(), L"", L"",
false, false, false));
clp->set_launch_timeout(timeout_);
clp->set_version_check(false);
@@ -338,7 +338,7 @@ TEST_F(CFACMockTest, OnChannelError) {
GURL empty;
scoped_refptr<ChromeFrameLaunchParams> clp(new ChromeFrameLaunchParams(
- empty, empty, profile_path_, profile_path_.BaseName().value(), L"",
+ empty, empty, profile_path_, profile_path_.BaseName().value(), L"", L"",
false, false, false));
clp->set_launch_timeout(1); // Unneeded timeout, but can't be 0.
clp->set_version_check(false);
@@ -457,7 +457,7 @@ TEST_F(CFACMockTest, NavigateTwiceAfterInitToSameUrl) {
scoped_refptr<ChromeFrameLaunchParams> launch_params(
new ChromeFrameLaunchParams(
GURL("http://www.nonexistent.com"), empty, profile_path_,
- profile_path_.BaseName().value(), L"", false, false, false));
+ profile_path_.BaseName().value(), L"", L"", false, false, false));
launch_params->set_launch_timeout(timeout);
launch_params->set_version_check(false);
EXPECT_TRUE(client_->Initialize(&cfd_, launch_params));