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

1 files changed, 14 insertions, 5 deletions

diff --git a/chrome_frame/chrome_frame_npapi_unittest.cc b/chrome_frame/chrome_frame_npapi_unittest.cc
index c0a0208..34194440 100644
--- a/chrome_frame/chrome_frame_npapi_unittest.cc
+++ b/chrome_frame/chrome_frame_npapi_unittest.cc
@@ -125,6 +125,7 @@ class TestNPAPIPrivilegedApi: public ::testing::Test {
                           bool expect_privilege_check,
                           bool is_privileged,
                           const std::wstring& profile_name,
+                          const std::wstring& language,
                           const std::wstring& extra_args) {
     EXPECT_CALL(mock_api, GetLocation())
         .WillOnce(Return(std::string("http://www.google.com")));
@@ -137,7 +138,7 @@ class TestNPAPIPrivilegedApi: public ::testing::Test {
 
     scoped_refptr<ChromeFrameLaunchParams> launch_params(
         new ChromeFrameLaunchParams(GURL(), GURL(), FilePath(), profile_name,
-            extra_args, is_incognito, true, false));
+            language, extra_args, is_incognito, true, false));
 
     EXPECT_CALL(*mock_automation,
       Initialize(_, LaunchParamEq(true, extra_args, is_incognito, true)))
@@ -177,6 +178,7 @@ TEST_F(TestNPAPIPrivilegedApi, NoPrivilegeCheckWhenNoArguments) {
                      false,  // Fail if privilege check is invoked.
                      false,
                      kDefaultProfileName,
+                     L"",    // No specific language override.
                      L"");   // No extra args to initialize.
 
   // No arguments, no privilege requested.
@@ -191,6 +193,7 @@ TEST_F(TestNPAPIPrivilegedApi, NoPrivilegeCheckWhenZeroArgument) {
                      false,  // Fail if privilege check is invoked.
                      false,
                      kDefaultProfileName,
+                     L"",    // No specific language override.
                      L"");   // No extra args to initialize.
 
   // Privileged mode explicitly zero.
@@ -207,6 +210,7 @@ TEST_F(TestNPAPIPrivilegedApi, NotPrivilegedDoesNotAllowArgsOrProfile) {
                      true,   // Fail unless privilege check is invoked.
                      false,  // Not privileged.
                      kDefaultProfileName,
+                     L"",    // No specific language override.
                      L"");   // No extra arguments allowed.
 
   char* argn[] = {
@@ -227,9 +231,10 @@ TEST_F(TestNPAPIPrivilegedApi, NotPrivilegedDoesNotAllowArgsOrProfile) {
 
 TEST_F(TestNPAPIPrivilegedApi, PrivilegedAllowsArgsAndProfile) {
   SetupPrivilegeTest(false,  // Not incognito.
-                     true,  // Fail unless privilege check is invoked.
-                     true,  // Privileged mode.
+                     true,   // Fail unless privilege check is invoked.
+                     true,   // Privileged mode.
                      L"custom_profile_name",  // Custom profile expected.
+                     L"",    // No specific language override.
                      L"-bar=far");  // Extra arguments expected
 
   // With privileged mode we expect automation to be enabled.
@@ -428,8 +433,9 @@ TEST_F(TestNPAPIPrivilegedProperty,
   // Attempt setting onprivatemessage when not privileged.
   SetupPrivilegeTest(false,  // not incognito.
                      true,   // expect privilege check.
-                     false,   // not privileged.
+                     false,  // not privileged.
                      kDefaultProfileName,
+                     L"",    // No specific language override.
                      L"");
 
   char* on_private_message_str = "onprivatemessage()";
@@ -464,6 +470,7 @@ TEST_F(TestNPAPIPrivilegedProperty,
                      true,   // expect privilege check.
                      true,   // privileged.
                      kDefaultProfileName,
+                     L"",    // No specific language override.
                      L"");
 
   char* on_private_message_str = "onprivatemessage()";
@@ -499,8 +506,9 @@ TEST_F(TestNPAPIPrivilegedProperty,
   // Assigning to onprivatemessage when not privileged should fail.
   SetupPrivilegeTest(false,  // not incognito.
                      true,   // expect privilege check.
-                     false,   // not privileged.
+                     false,  // not privileged.
                      kDefaultProfileName,
+                     L"",    // No specific language override.
                      L"");
 
   char* argn = "privileged_mode";
@@ -529,6 +537,7 @@ TEST_F(TestNPAPIPrivilegedProperty,
                      true,   // expect privilege check.
                      true,   // privileged.
                      kDefaultProfileName,
+                     L"",    // No specific language override.
                      L"");
 
   char* argn = "privileged_mode";