more changes

chrome/browser/ui/webui/options/chromeos/internet_options_handler.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/ui/webui/options/chromeos/internet_options_handler.h"
 
 #include <ctype.h>
 
 #include <map>
 #include <string>
@@ skipping 1033 matching lines @@
         status.append(chromeos::CellularNetwork::ActivationStateToString(
             activation_state));
       }
     }
   }
 
   // To keep the consistency with JS implementation, do not change the order
   // locally.
   // TODO(kochi): Use dictionaly for future maintainability.
   // 0) service path
-  network->Append(Value::CreateStringValue(service_path));
+  network->Append(base::StringValue::New(service_path));
   // 1) name
-  network->Append(Value::CreateStringValue(name));
+  network->Append(base::StringValue::New(name));
   // 2) status
-  network->Append(Value::CreateStringValue(status));
+  network->Append(base::StringValue::New(status));
   // 3) type
-  network->Append(Value::CreateIntegerValue(static_cast<int>(connection_type)));
+  network->Append(base::NumberValue::New(static_cast<int>(connection_type)));
   // 4) connected
-  network->Append(Value::CreateBooleanValue(connected));
+  network->Append(base::BooleanValue::New(connected));
   // 5) connecting
-  network->Append(Value::CreateBooleanValue(connecting));
+  network->Append(base::BooleanValue::New(connecting));
   // 6) icon data url
-  network->Append(Value::CreateStringValue(icon.isNull() ? "" :
+  network->Append(base::StringValue::New(icon.isNull() ? "" :
       web_ui_util::GetImageDataUrl(icon)));
   // 7) remembered
-  network->Append(Value::CreateBooleanValue(remembered));
+  network->Append(base::BooleanValue::New(remembered));
   // 8) activation state
-  network->Append(Value::CreateIntegerValue(
+  network->Append(base::NumberValue::New(
                     static_cast<int>(activation_state)));
   // 9) needs new plan
-  network->Append(Value::CreateBooleanValue(needs_new_plan));
+  network->Append(base::BooleanValue::New(needs_new_plan));
   // 10) connectable
-  network->Append(Value::CreateBooleanValue(connectable));
+  network->Append(base::BooleanValue::New(connectable));
   return network;
 }
 
 ListValue* InternetOptionsHandler::GetWiredList() {
   ListValue* list = new ListValue();
 
   // If ethernet is not enabled, then don't add anything.
   if (cros_->ethernet_enabled()) {
     const chromeos::EthernetNetwork* ethernet_network =
         cros_->ethernet_network();
@@ skipping 181 matching lines @@
   dictionary->SetBoolean("accessLocked", cros_->IsLocked());
   dictionary->Set("wiredList", GetWiredList());
   dictionary->Set("wirelessList", GetWirelessList());
   dictionary->Set("vpnList", GetVPNList());
   dictionary->Set("rememberedList", GetRememberedList());
   dictionary->SetBoolean("wifiAvailable", cros_->wifi_available());
   dictionary->SetBoolean("wifiEnabled", cros_->wifi_enabled());
   dictionary->SetBoolean("cellularAvailable", cros_->cellular_available());
   dictionary->SetBoolean("cellularEnabled", cros_->cellular_enabled());
 }