Remove base::StringValue

chrome/browser/chromeos/proxy_cros_settings_parser.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/proxy_cros_settings_parser.h"
 
 #include <stdint.h>
 
 #include "base/macros.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "chromeos/network/proxy/ui_proxy_config.h"
 #include "chromeos/network/proxy/ui_proxy_config_service.h"
 
 namespace chromeos {
 
 namespace {
 
 base::Value* CreateServerHostValue(const UIProxyConfig::ManualProxy& proxy) {
-  return proxy.server.is_valid() ?
-         new base::StringValue(proxy.server.host_port_pair().host()) :
-         NULL;
+  return proxy.server.is_valid()
+             ? new base::Value(proxy.server.host_port_pair().host())
+             : NULL;
 }
 
 base::Value* CreateServerPortValue(const UIProxyConfig::ManualProxy& proxy) {
   return proxy.server.is_valid()
              ? new base::Value(proxy.server.host_port_pair().port())
              : NULL;
 }
 
 net::ProxyServer CreateProxyServer(std::string host,
                                    uint16_t port,
@@ skipping 252 matching lines @@
                        base::Value** out_value) {
   std::string controlled_by;
   base::Value* data = NULL;
   UIProxyConfig config;
   config_service->GetProxyConfig(network_guid, &config);
 
   if (path == kProxyPacUrl) {
     // Only show pacurl for pac-script mode.
     if (config.mode == UIProxyConfig::MODE_PAC_SCRIPT &&
         config.automatic_proxy.pac_url.is_valid()) {
-      data = new base::StringValue(config.automatic_proxy.pac_url.spec());
+      data = new base::Value(config.automatic_proxy.pac_url.spec());
     }
   } else if (path == kProxySingleHttp) {
     data = CreateServerHostValue(config.single_proxy);
   } else if (path == kProxySingleHttpPort) {
     data = CreateServerPortValue(config.single_proxy);
   } else if (path == kProxyHttpUrl) {
     data = CreateServerHostValue(config.http_proxy);
   } else if (path == kProxyHttpsUrl) {
     data = CreateServerHostValue(config.https_proxy);
   } else if (path == kProxyType) {
@@ skipping 44 matching lines @@
       list->AppendString(rule->ToString());
     data = list;
   } else {
     *out_value = NULL;
     return false;
   }
 
   // Decorate pref value as CoreOptionsHandler::CreateValueForPref() does.
   base::DictionaryValue* dict = new base::DictionaryValue;
   if (!data)
-    data = new base::StringValue("");
+    data = new base::Value("");
   dict->Set("value", data);
   if (path == kProxyType) {
     if (!controlled_by.empty())
       dict->SetString("controlledBy", controlled_by);
     dict->SetBoolean("disabled", !config.user_modifiable);
   } else {
     dict->SetBoolean("disabled", false);
   }
   *out_value = dict;
   return true;
 }
 
 }  // namespace proxy_cros_settings_parser
 
 }  // namespace chromeos