Upstream version 9.38.198.0
[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / extensions / info_private_api.cc
index 993683b..dbe59d1 100644 (file)
@@ -11,7 +11,6 @@
 #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"
@@ -23,6 +22,7 @@
 #include "chromeos/settings/cros_settings_names.h"
 #include "chromeos/system/statistics_provider.h"
 #include "components/metrics/metrics_service.h"
+#include "components/user_manager/user_manager.h"
 #include "extensions/common/error_utils.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
@@ -181,10 +181,10 @@ base::Value* ChromeosInfoPrivateGetFunction::GetValue(
   } else if (property_name == kPropertyBoard) {
     return new base::StringValue(base::SysInfo::GetLsbReleaseBoard());
   } else if (property_name == kPropertyOwner) {
-    return base::Value::CreateBooleanValue(
-        chromeos::UserManager::Get()->IsCurrentUserOwner());
+    return new base::FundamentalValue(
+        user_manager::UserManager::Get()->IsCurrentUserOwner());
   } else if (property_name == kPropertyClientId) {
-    return base::Value::CreateStringValue(GetClientId());
+    return new base::StringValue(GetClientId());
   } else if (property_name == kPropertyTimezone) {
     return chromeos::CrosSettings::Get()->GetPref(
             chromeos::kSystemTimezone)->DeepCopy();
@@ -195,7 +195,7 @@ base::Value* ChromeosInfoPrivateGetFunction::GetValue(
     const char* pref_name =
         GetBoolPrefNameForApiProperty(property_name.c_str());
     if (pref_name) {
-      return base::Value::CreateBooleanValue(
+      return new base::FundamentalValue(
           Profile::FromBrowserContext(context_)->GetPrefs()->GetBoolean(
               pref_name));
     }