cros: Expose client_id via chromeosInfoPrivate.

Expose client_id in chromeosInforPrivate for enterprise
kiosk.

BUG=328437

Review URL: https://codereview.chromium.org/308913004

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

3 files changed, 27 insertions, 1 deletions

diff --git a/chrome/browser/chromeos/extensions/info_private_api.cc b/chrome/browser/chromeos/extensions/info_private_api.cc
index c6079c3..9d4d482 100644
--- a/chrome/browser/chromeos/extensions/info_private_api.cc
+++ b/chrome/browser/chromeos/extensions/info_private_api.cc
@@ -8,10 +8,14 @@
 #include "base/prefs/pref_service.h"
 #include "base/sys_info.h"
 #include "base/values.h"
+#include "chrome/browser/app_mode/app_mode_utils.h"
+#include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/users/user_manager.h"
+#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/system/timezone_util.h"
+#include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/network/device_state.h"
@@ -43,9 +47,12 @@ const char kPropertyInitialLocale[] = "initialLocale";
 // Key which corresponds to the board property in JS.
 const char kPropertyBoard[] = "board";
 
-// Key which corresponds to the board property in JS.
+// Key which corresponds to the isOwner property in JS.
 const char kPropertyOwner[] = "isOwner";
 
+// Key which corresponds to the clientId property in JS.
+const char kPropertyClientId[] = "clientId";
+
 // Key which corresponds to the timezone property in JS.
 const char kPropertyTimezone[] = "timezone";
 
@@ -103,6 +110,21 @@ const char* GetBoolPrefNameForApiProperty(const char* api_name) {
   return NULL;
 }
 
+bool IsEnterpriseKiosk() {
+  if (!chrome::IsRunningInForcedAppMode())
+    return false;
+
+  policy::BrowserPolicyConnectorChromeOS* connector =
+      g_browser_process->platform_part()->browser_policy_connector_chromeos();
+  return connector->IsEnterpriseManaged();
+}
+
+std::string GetClientId() {
+  return IsEnterpriseKiosk()
+             ? g_browser_process->metrics_service()->GetClientId()
+             : std::string();
+}
+
 }  // namespace
 
 ChromeosInfoPrivateGetFunction::ChromeosInfoPrivateGetFunction() {
@@ -158,6 +180,8 @@ base::Value* ChromeosInfoPrivateGetFunction::GetValue(
   } else if (property_name == kPropertyOwner) {
     return base::Value::CreateBooleanValue(
         chromeos::UserManager::Get()->IsCurrentUserOwner());
+  } else if (property_name == kPropertyClientId) {
+    return base::Value::CreateStringValue(GetClientId());
   } else if (property_name == kPropertyTimezone) {
     return chromeos::CrosSettings::Get()->GetPref(
             chromeos::kSystemTimezone)->DeepCopy();
diff --git a/chrome/common/extensions/api/chromeos_info_private.json b/chrome/common/extensions/api/chromeos_info_private.json
index b7abe39..65604a0 100644
--- a/chrome/common/extensions/api/chromeos_info_private.json
+++ b/chrome/common/extensions/api/chromeos_info_private.json
@@ -38,6 +38,7 @@
                   "hwid": {"type": "string", "optional": true, "description": "Hardware ID"},
                   "initialLocale" : {"type": "string", "optional": true, "description": "Initial locale for the device"},
                   "isOwner" : {"type": "boolean", "optional": true, "description": "True if current logged in user is device owner"},
+                  "clientId" : {"type": "string", "optional": true, "description": "Device client id"},
                   "timezone" : {"type": "string", "optional": true, "description": "Timezone"},
                   "a11yLargeCursorEnabled" : {"type": "boolean", "optional": true, "description": "If true, ChromeOS is showing enlarged cursor."},
                   "a11yStickyKeysEnabled" : {"type": "boolean", "optional": true, "description": "If true, sticky keys are turned on."},
diff --git a/chrome/test/data/extensions/api_test/chromeos_info_private/background.js b/chrome/test/data/extensions/api_test/chromeos_info_private/background.js
index 0ab4c03..89204c5 100644
--- a/chrome/test/data/extensions/api_test/chromeos_info_private/background.js
+++ b/chrome/test/data/extensions/api_test/chromeos_info_private/background.js
@@ -107,6 +107,7 @@ var tests = generateTestsForKeys(['hwid',
                                   'initialLocale',
                                   'board',
                                   'isOwner',
+                                  'clientId',
                                   'a11yLargeCursorEnabled',
                                   'a11yStickyKeysEnabled',
                                   'a11ySpokenFeedbackEnabled',