Revert 167808 - Get rid of use of CreateStringValue in chromeos/ directory.

chrome/browser/chromeos/extensions/info_private_api.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/extensions/info_private_api.h"
 
 #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/user_manager.h"
@@ skipping 36 matching lines @@
 GetChromeosInfoFunction::~GetChromeosInfoFunction() {
 }
 
 bool GetChromeosInfoFunction::RunImpl() {
   ListValue* list = NULL;
   EXTENSION_FUNCTION_VALIDATE(args_->GetList(0, &list));
   scoped_ptr<DictionaryValue> result(new DictionaryValue());
   for (size_t i = 0; i < list->GetSize(); ++i) {
     std::string property_name;
     EXTENSION_FUNCTION_VALIDATE(list->GetString(i, &property_name));
-    Value* value = GetValue(property_name);
-    if (value)
+    Value* value = NULL;
+    if (GetValue(property_name, &value))
       result->Set(property_name, value);
   }
   SetResult(result.release());
   SendResponse(true);
   return true;
 }
 
-base::Value* GetChromeosInfoFunction::GetValue(
-    const std::string& property_name) {
+bool GetChromeosInfoFunction::GetValue(const std::string& property_name,
+                                       Value** value) {
   if (property_name == kPropertyHWID) {
     std::string hwid;
     chromeos::system::StatisticsProvider* provider =
         chromeos::system::StatisticsProvider::GetInstance();
     provider->GetMachineStatistic(kHardwareClass, &hwid);
-    return new base::StringValue(hwid);
+    *value = Value::CreateStringValue(hwid);
   } else if (property_name == kPropertyHomeProvider) {
     NetworkLibrary* netlib = CrosLibrary::Get()->GetNetworkLibrary();
-    return new base::StringValue(netlib->GetCellularHomeCarrierId());
+    *value = Value::CreateStringValue(netlib->GetCellularHomeCarrierId());
   } else if (property_name == kPropertyInitialLocale) {
-    return new base::StringValue(
+    *value = Value::CreateStringValue(
         chromeos::WizardController::GetInitialLocale());
   } else if (property_name == kPropertyBoard) {
     std::string board;
     chromeos::system::StatisticsProvider* provider =
         chromeos::system::StatisticsProvider::GetInstance();
     provider->GetMachineStatistic(kPropertyReleaseBoard, &board);
-    return new base::StringValue(board);
+    *value = Value::CreateStringValue(board);
   } else if (property_name == kPropertyOwner) {
-    return Value::CreateBooleanValue(
+    *value = Value::CreateBooleanValue(
         chromeos::UserManager::Get()->IsCurrentUserOwner());
+  } else {
+    LOG(ERROR) << "Unknown property request: " << property_name;
+    return false;
   }
-
-  DLOG(ERROR) << "Unknown property request: " << property_name;
-  return NULL;
+  return true;
 }
 
 }  // namespace extensions