Expose initial_locale via chrome.chromeosInfoPrivate

BUG=chromium-os:16288
TEST=ExtensionApiTest.CustomizationPrivateTest

Review URL: http://codereview.chromium.org/6995105

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88643 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/extensions/extension_info_private_api_chromeos.cc

@@ -7,6 +7,7 @@
 #include "base/values.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
+#include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/system_access.h"
 
 using chromeos::CrosLibrary;
@@ -23,6 +24,9 @@ const char kPropertyHWID[] = "hwid";
 // Key which corresponds to the home provider property.
 const char kPropertyHomeProvider[] = "homeProvider";
 
+// Key which corresponds to the initial_locale property.
+const char kPropertyInitialLocale[] = "initialLocale";
+
 }  // namespace
 
 GetChromeosInfoFunction::GetChromeosInfoFunction() {
@@ -60,6 +64,8 @@ bool GetChromeosInfoFunction::GetValue(const std::string& property_name,
     } else {
       LOG(ERROR) << "CrosLibrary can't be loaded.";
     }
+  } else if (property_name == kPropertyInitialLocale) {
+    *value = chromeos::WizardController::GetInitialLocale();
   } else {
     LOG(ERROR) << "Unknown property request: " << property_name;
     return false;

chrome/common/extensions/api/extension_api.json

@@ -1139,12 +1139,12 @@
                 "description": "A URL to navigate the tab to."
               },
               "selected": {
-                "type": "boolean", 
+                "type": "boolean",
                 "optional": true,
                 "description": "Whether the tab should be selected."
               },
               "pinned": {
-                "type": "boolean", 
+                "type": "boolean",
                 "optional": true,
                 "description": "Whether the tab should be pinned."
               }
@@ -1454,13 +1454,13 @@
         "description": "Fires when a tab is closed. Note: A listener can be registered for this event without requesting the 'tabs' permission in the manifest.",
         "parameters": [
           {"type": "integer", "name": "tabId", "minimum": 0},
-          { 
+          {
             "type": "object",
             "name": "removeInfo",
             "properties": {
               "isWindowClosing": {"type": "boolean", "description": "True when the tab is being closed because its window is being closed." }
-            }            
-          }          
+            }
+          }
         ]
       }
     ]
@@ -3252,12 +3252,12 @@
             "name": "callback",
             "parameters": [
               {
-                "name": "enabled", 
+                "name": "enabled",
                 "type": "boolean",
                 "description": "The actual value set. If it is not the one passed in parameter, the value couldn't be changed (e.g. because of security)."
               }
             ]
-          }          
+          }
         ]
       },
       {
@@ -3392,7 +3392,8 @@
                 "description": "Dictionary which contains all requested properties",
                 "properties": {
                   "hwid": {"type": "string", "optional": "true", "description": "Hardware ID"},
-                  "homeProvider" : {"type": "string", "optional": "true", "description": "Home provider which is used by the cellular device"}
+                  "homeProvider" : {"type": "string", "optional": "true", "description": "Home provider which is used by the cellular device"},
+                  "initialLocale" : {"type": "string", "optional": "true", "description": "Initial locale for the device"}
                 }
               }
             ]
@@ -5527,11 +5528,11 @@
             "maximum": 65535,
             "description": "TCP port number."
           },
-          { 
+          {
             "type": "function",
             "name": "callback",
             "parameters": [
-              { 
+              {
                 "type": "string",
                 "name": "passport",
                 "description": "Passport for passing to proxy."

chrome/test/data/extensions/api_test/chromeos_info_private/background.html

@@ -5,16 +5,27 @@
   function getTestFunctionFor(keys, fails) {
     return function generatedTest () {
       // Debug.
-      console.log("keys: " + keys + ", fails: " + fails);
+      console.log("keys: " + keys + "; fails: " + fails);
 
       chrome.chromeosInfoPrivate.get(
           keys,
-          pass(function(values) {
-            // Debug
-            console.log("values: ", values);
-            for (var i = 0; i < keys.length; ++i)
-              chrome.test.assertEq(!(i in fails), keys[i] in values);
-            }));
+          pass(
+            function(values) {
+              for (var i = 0; i < keys.length; ++i) {
+                // Debug
+                if (keys[i] in values) {
+                  console.log("  values['" + keys[i] + "'] = " +
+                              values[keys[i]]);
+                } else {
+                  console.log("  " + keys[i] + " is missing in values");
+                }
+
+                chrome.test.assertEq(fails.indexOf(keys[i]) == -1,
+                                     keys[i] in values);
+              }
+            }
+          )
+      );
     }
   }
 
@@ -25,8 +36,8 @@
     // Test with all the keys at one.
     tests.push(getTestFunctionFor(keys, []));
     // Tests with key which hasn't corresponding value.
-    var noValueKey = "no-value-for-this-key";
-    tests.push(getTestFunctionFor([noValueKey], [0]));
+    var noValueKey = "noValueForThisKey";
+    tests.push(getTestFunctionFor([noValueKey], [noValueKey]));
 
     if (keys.length > 1) {
       // Tests with the separate keys.
@@ -34,13 +45,14 @@
         tests.push(getTestFunctionFor([keys[i]], []));
       }
     }
-    if (keys.length > 2) {
+    if (keys.length >= 2) {
       tests.push(getTestFunctionFor([keys[0], keys[1]], []));
-      tests.push(getTestFunctionFor([keys[0], noValueKey, keys[1]], [1]));
+      tests.push(getTestFunctionFor([keys[0], noValueKey, keys[1]],
+                                    [noValueKey]));
     }
     return tests;
   }
 
-  var tests = generateTestsForKeys(["hwid", "homeProvider"])
+  var tests = generateTestsForKeys(["hwid", "homeProvider", "initialLocale"])
   chrome.test.runTests(tests);
 </script>