Revert recent changes to base::Value

chrome/browser/chromeos/cros/network_library.cc

 // Copyright (c) 2011 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/cros/network_library.h"
 
 #include <algorithm>
 #include <map>
 #include <set>
 
@@ skipping 165 matching lines @@
 }
 
 NetworkDevice::~NetworkDevice() {}
 
 void NetworkDevice::ParseInfo(const DictionaryValue& info) {
   if (device_parser_.get())
     device_parser_->UpdateDeviceFromInfo(info, this);
 }
 
 bool NetworkDevice::UpdateStatus(const std::string& key,
-                                 Value* value,
+                                 const Value& value,
                                  PropertyIndex* index) {
   if (device_parser_.get())
     return device_parser_->UpdateStatus(key, value, this, index);
   return false;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Network
 
 Network::Network(const std::string& service_path,
@@ skipping 226 matching lines @@
           ip_address_ = ipconfig.address;
           break;
         }
       }
       chromeos::FreeIPConfigStatus(ipconfig_status);
     }
   }
 }
 
 bool Network::UpdateStatus(const std::string& key,
-                           Value* value,
+                           const Value& value,
                            PropertyIndex* index) {
   if (network_parser_.get())
     return network_parser_->UpdateStatus(key, value, this, index);
   return false;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // EthernetNetwork
 
 EthernetNetwork::EthernetNetwork(const std::string& service_path)
@@ skipping 2530 matching lines @@
   virtual NetworkIPConfigVector GetIPConfigs(
       const std::string& device_path,
       std::string* hardware_address,
       HardwareAddressFormat format) OVERRIDE;
   virtual void SetIPConfig(const NetworkIPConfig& ipconfig) OVERRIDE;
 
   //////////////////////////////////////////////////////////////////////////////
   // Calbacks.
   static void NetworkStatusChangedHandler(
       void* object, const char* path, const char* key, const Value* value);
-  void UpdateNetworkStatus(const std::string& path,
-                           const std::string& key,
-                           Value* value);
+  void UpdateNetworkStatus(
+      const std::string& path, const std::string& key, const Value& value);
 
   static void NetworkDevicePropertyChangedHandler(
       void* object, const char* path, const char* key, const Value* value);
   void UpdateNetworkDeviceStatus(
-      const std::string& path, const std::string& key, Value* value);
+      const std::string& path, const std::string& key, const Value& value);
 
   static void PinOperationCallback(void* object,
                                    const char* path,
                                    NetworkMethodErrorType error,
                                    const char* error_message);
 
   static void CellularRegisterCallback(void* object,
                                        const char* path,
                                        NetworkMethodErrorType error,
                                        const char* error_message);
@@ skipping 166 matching lines @@
 }
 
 // static callback
 void NetworkLibraryImplCros::NetworkStatusChangedHandler(
     void* object, const char* path, const char* key, const Value* value) {
   NetworkLibraryImplCros* networklib =
       static_cast<NetworkLibraryImplCros*>(object);
   DCHECK(networklib);
   if (key == NULL || value == NULL || path == NULL || object == NULL)
     return;
-  networklib->UpdateNetworkStatus(std::string(path),
-                                  std::string(key),
-                                  const_cast<Value*>(value));
+  networklib->UpdateNetworkStatus(std::string(path), std::string(key), *value);
 }
 
-void NetworkLibraryImplCros::UpdateNetworkStatus(const std::string& path,
-                                                 const std::string& key,
-                                                 Value* value) {
+void NetworkLibraryImplCros::UpdateNetworkStatus(
+    const std::string& path, const std::string& key, const Value& value) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   Network* network = FindNetworkByPath(path);
   if (network) {
     VLOG(2) << "UpdateNetworkStatus: " << network->name() << "." << key;
     bool prev_connected = network->connected();
     if (!network->UpdateStatus(key, value, NULL)) {
       LOG(WARNING) << "UpdateNetworkStatus: Error updating: "
                    << path << "." << key;
     }
     // If we just connected, this may have been added to remembered list.
     if (!prev_connected && network->connected())
       RequestRememberedNetworksUpdate();
     NotifyNetworkChanged(network);
     // Anything observing the manager needs to know about any service change.
     NotifyNetworkManagerChanged(false);  // Not forced.
   }
 }
 
 // static callback
 void NetworkLibraryImplCros::NetworkDevicePropertyChangedHandler(
     void* object, const char* path, const char* key, const Value* value) {
   NetworkLibraryImplCros* networklib =
       static_cast<NetworkLibraryImplCros*>(object);
   DCHECK(networklib);
   if (key == NULL || value == NULL || path == NULL || object == NULL)
     return;
   networklib->UpdateNetworkDeviceStatus(std::string(path),
                                         std::string(key),
-                                        const_cast<Value*>(value));
+                                        *value);
 }
 
-void NetworkLibraryImplCros::UpdateNetworkDeviceStatus(const std::string& path,
-                                                       const std::string& key,
-                                                       Value* value) {
+void NetworkLibraryImplCros::UpdateNetworkDeviceStatus(
+    const std::string& path, const std::string& key, const Value& value) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   NetworkDevice* device = FindNetworkDeviceByPath(path);
   if (device) {
     VLOG(2) << "UpdateNetworkDeviceStatus: " << device->name() << "." << key;
     PropertyIndex index = PROPERTY_INDEX_UNKNOWN;
     if (device->UpdateStatus(key, value, &index)) {
       if (index == PROPERTY_INDEX_CELLULAR_ALLOW_ROAMING) {
         if (!device->data_roaming_allowed() && IsCellularAlwaysInRoaming()) {
           SetCellularDataRoamingAllowed(true);
         } else {
@@ skipping 1427 matching lines @@
   return network_library;
 }
 
 /////////////////////////////////////////////////////////////////////////////
 
 }  // namespace chromeos
 
 // Allows InvokeLater without adding refcounting. This class is a Singleton and
 // won't be deleted until its last InvokeLater is run.
 DISABLE_RUNNABLE_METHOD_REFCOUNT(chromeos::NetworkLibraryImplBase);