Update uses of Value in chromeos/, cloud_print/, components/, content…

…/ to use the base:: namespace. BUG=88666 TEST=no change TBR=ben@chromium.org Review URL: https://codereview.chromium.org/108603005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242409 0039d316-1c4b-4281-b951-d872f2087c98
FairyWorld · Dec 23, 2013 · 85ecd7e · 85ecd7e
1 parent e53a7f2
commit 85ecd7e
Show file tree

Hide file tree

Showing 70 changed files with 328 additions and 308 deletions.
diff --git a/chromeos/dbus/nfc_device_client.cc b/chromeos/dbus/nfc_device_client.cc
@@ -111,7 +111,7 @@ class NfcDeviceClientImpl : public NfcDeviceClient,
     dbus::MessageWriter array_writer(NULL);
     dbus::MessageWriter dict_entry_writer(NULL);
     writer.OpenArray("{sv}", &array_writer);
-    for (DictionaryValue::Iterator iter(attributes);
+    for (base::DictionaryValue::Iterator iter(attributes);
          !iter.IsAtEnd(); iter.Advance()) {
       array_writer.OpenDictEntry(&dict_entry_writer);
       dict_entry_writer.AppendString(iter.key());

diff --git a/chromeos/dbus/nfc_tag_client.cc b/chromeos/dbus/nfc_tag_client.cc
@@ -102,7 +102,7 @@ class NfcTagClientImpl : public NfcTagClient,
     dbus::MessageWriter array_writer(NULL);
     dbus::MessageWriter dict_entry_writer(NULL);
     writer.OpenArray("{sv}", &array_writer);
-    for (DictionaryValue::Iterator iter(attributes);
+    for (base::DictionaryValue::Iterator iter(attributes);
          !iter.IsAtEnd(); iter.Advance()) {
       array_writer.OpenDictEntry(&dict_entry_writer);
       dict_entry_writer.AppendString(iter.key());

diff --git a/chromeos/network/device_state.h b/chromeos/network/device_state.h
@@ -47,7 +47,7 @@ class CHROMEOS_EXPORT DeviceState : public ManagedState {
   const std::string& iccid() const { return iccid_; }
   const std::string& mdn() const { return mdn_; }
   const CellularScanResults& scan_results() const { return scan_results_; }
-  const DictionaryValue& properties() const { return properties_; }
+  const base::DictionaryValue& properties() const { return properties_; }
 
   // Ethernet specific accessors
   bool eap_authentication_completed() const {
@@ -83,7 +83,7 @@ class CHROMEOS_EXPORT DeviceState : public ManagedState {
 
   // Keep all Device properties in a dictionary. Devices are limited and should
   // change rarely if ever, so the overhead for this is small.
-  DictionaryValue properties_;
+  base::DictionaryValue properties_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceState);
 };

diff --git a/chromeos/network/network_configuration_handler_unittest.cc b/chromeos/network/network_configuration_handler_unittest.cc
@@ -497,7 +497,7 @@ class NetworkConfigurationHandlerStubTest : public testing::Test {
   base::MessageLoopForUI message_loop_;
   std::string success_callback_name_;
   std::string get_properties_path_;
-  scoped_ptr<DictionaryValue> get_properties_;
+  scoped_ptr<base::DictionaryValue> get_properties_;
   std::string create_service_path_;
 };
 

diff --git a/chromeos/network/network_device_handler_impl.cc b/chromeos/network/network_device_handler_impl.cc
@@ -69,7 +69,7 @@ void RefreshIPConfigsCallback(
     const network_handler::ErrorCallback& error_callback,
     const std::string& device_path,
     const base::DictionaryValue& properties) {
-  const ListValue* ip_configs;
+  const base::ListValue* ip_configs;
   if (!properties.GetListWithoutPathExpansion(
           shill::kIPConfigsProperty, &ip_configs)) {
     NET_LOG_ERROR("RequestRefreshIPConfigs Failed", device_path);

diff --git a/chromeos/network/network_state_unittest.cc b/chromeos/network/network_state_unittest.cc
@@ -37,7 +37,7 @@ class TestStringValue : public base::Value {
     return new TestStringValue(value_);
   }
 
-  virtual bool Equals(const Value* other) const OVERRIDE {
+  virtual bool Equals(const base::Value* other) const OVERRIDE {
     if (other->GetType() != GetType())
       return false;
     std::string lhs, rhs;

diff --git a/chromeos/network/network_util.cc b/chromeos/network/network_util.cc
@@ -93,15 +93,17 @@ int32 NetmaskToPrefixLength(const std::string& netmask) {
   return prefix_length;
 }
 
-bool ParseCellularScanResults(
-    const ListValue& list, std::vector<CellularScanResult>* scan_results) {
+bool ParseCellularScanResults(const base::ListValue& list,
+                              std::vector<CellularScanResult>* scan_results) {
   scan_results->clear();
   scan_results->reserve(list.GetSize());
-  for (ListValue::const_iterator it = list.begin(); it != list.end(); ++it) {
+  for (base::ListValue::const_iterator it = list.begin();
+       it != list.end(); ++it) {
     if (!(*it)->IsType(base::Value::TYPE_DICTIONARY))
       return false;
     CellularScanResult scan_result;
-    const DictionaryValue* dict = static_cast<const DictionaryValue*>(*it);
+    const base::DictionaryValue* dict =
+        static_cast<const base::DictionaryValue*>(*it);
     // If the network id property is not present then this network cannot be
     // connected to so don't include it in the results.
     if (!dict->GetStringWithoutPathExpansion(shill::kNetworkIdProperty,

diff --git a/chromeos/network/network_util.h b/chromeos/network/network_util.h
@@ -77,7 +77,7 @@ CHROMEOS_EXPORT int32 NetmaskToPrefixLength(const std::string& netmask);
 // CellularScanResult in |scan_results|. Returns false if parsing fails,
 // in which case the contents of |scan_results| will be undefined.
 CHROMEOS_EXPORT bool ParseCellularScanResults(
-    const ListValue& list, std::vector<CellularScanResult>* scan_results);
+    const base::ListValue& list, std::vector<CellularScanResult>* scan_results);
 
 }  // namespace network_util
 }  // namespace chromeos

diff --git a/chromeos/network/network_util_unittest.cc b/chromeos/network/network_util_unittest.cc
@@ -104,7 +104,7 @@ TEST_F(NetworkUtilTest, PrefixLengthToNetmask) {
 }
 
 TEST_F(NetworkUtilTest, ParseScanResults) {
-  ListValue list;
+  base::ListValue list;
   std::vector<CellularScanResult> scan_results;
 
   // Empty list value.
@@ -116,20 +116,20 @@ TEST_F(NetworkUtilTest, ParseScanResults) {
 
   // Scan result has no network id.
   list.Clear();
-  DictionaryValue* dict_value = new DictionaryValue();
+  base::DictionaryValue* dict_value = new base::DictionaryValue();
   dict_value->SetString(shill::kStatusProperty, "available");
   list.Append(dict_value);
   EXPECT_TRUE(ParseCellularScanResults(list, &scan_results));
   EXPECT_TRUE(scan_results.empty());
 
   // Mixed parse results.
-  dict_value = new DictionaryValue();
+  dict_value = new base::DictionaryValue();
   dict_value->SetString(shill::kNetworkIdProperty, "000001");
   dict_value->SetString(shill::kStatusProperty, "unknown");
   dict_value->SetString(shill::kTechnologyProperty, "GSM");
   list.Append(dict_value);
 
-  dict_value = new DictionaryValue();
+  dict_value = new base::DictionaryValue();
   dict_value->SetString(shill::kNetworkIdProperty, "000002");
   dict_value->SetString(shill::kStatusProperty, "available");
   dict_value->SetString(shill::kLongNameProperty, "Long Name");

diff --git a/chromeos/network/onc/onc_signature.cc b/chromeos/network/onc/onc_signature.cc
@@ -14,25 +14,25 @@ namespace onc {
 namespace {
 
 const OncValueSignature kBoolSignature = {
-  Value::TYPE_BOOLEAN, NULL
+  base::Value::TYPE_BOOLEAN, NULL
 };
 const OncValueSignature kStringSignature = {
-  Value::TYPE_STRING, NULL
+  base::Value::TYPE_STRING, NULL
 };
 const OncValueSignature kIntegerSignature = {
-  Value::TYPE_INTEGER, NULL
+  base::Value::TYPE_INTEGER, NULL
 };
 const OncValueSignature kStringListSignature = {
-  Value::TYPE_LIST, NULL, &kStringSignature
+  base::Value::TYPE_LIST, NULL, &kStringSignature
 };
 const OncValueSignature kIntegerListSignature = {
-  Value::TYPE_LIST, NULL, &kIntegerSignature
+  base::Value::TYPE_LIST, NULL, &kIntegerSignature
 };
 const OncValueSignature kIPConfigListSignature = {
-  Value::TYPE_LIST, NULL, &kIPConfigSignature
+  base::Value::TYPE_LIST, NULL, &kIPConfigSignature
 };
 const OncValueSignature kCellularApnListSignature = {
-  Value::TYPE_LIST, NULL, &kCellularApnSignature
+  base::Value::TYPE_LIST, NULL, &kCellularApnSignature
 };
 
 const OncFieldSignature issuer_subject_pattern_fields[] = {
@@ -310,88 +310,89 @@ const OncFieldSignature toplevel_configuration_fields[] = {
 }  // namespace
 
 const OncValueSignature kRecommendedSignature = {
-  Value::TYPE_LIST, NULL, &kStringSignature
+  base::Value::TYPE_LIST, NULL, &kStringSignature
 };
 const OncValueSignature kEAPSignature = {
-  Value::TYPE_DICTIONARY, eap_fields, NULL
+  base::Value::TYPE_DICTIONARY, eap_fields, NULL
 };
 const OncValueSignature kIssuerSubjectPatternSignature = {
-  Value::TYPE_DICTIONARY, issuer_subject_pattern_fields, NULL
+  base::Value::TYPE_DICTIONARY, issuer_subject_pattern_fields, NULL
 };
 const OncValueSignature kCertificatePatternSignature = {
-  Value::TYPE_DICTIONARY, certificate_pattern_fields, NULL
+  base::Value::TYPE_DICTIONARY, certificate_pattern_fields, NULL
 };
 const OncValueSignature kIPsecSignature = {
-  Value::TYPE_DICTIONARY, ipsec_fields, NULL
+  base::Value::TYPE_DICTIONARY, ipsec_fields, NULL
 };
 const OncValueSignature kL2TPSignature = {
-  Value::TYPE_DICTIONARY, l2tp_fields, NULL
+  base::Value::TYPE_DICTIONARY, l2tp_fields, NULL
 };
 const OncValueSignature kOpenVPNSignature = {
-  Value::TYPE_DICTIONARY, openvpn_fields, NULL
+  base::Value::TYPE_DICTIONARY, openvpn_fields, NULL
 };
 const OncValueSignature kVerifyX509Signature = {
-  Value::TYPE_DICTIONARY, verify_x509_fields, NULL
+  base::Value::TYPE_DICTIONARY, verify_x509_fields, NULL
 };
 const OncValueSignature kVPNSignature = {
-  Value::TYPE_DICTIONARY, vpn_fields, NULL
+  base::Value::TYPE_DICTIONARY, vpn_fields, NULL
 };
 const OncValueSignature kEthernetSignature = {
-  Value::TYPE_DICTIONARY, ethernet_fields, NULL
+  base::Value::TYPE_DICTIONARY, ethernet_fields, NULL
 };
 const OncValueSignature kIPConfigSignature = {
-  Value::TYPE_DICTIONARY, ipconfig_fields, NULL
+  base::Value::TYPE_DICTIONARY, ipconfig_fields, NULL
 };
 const OncValueSignature kProxyLocationSignature = {
-  Value::TYPE_DICTIONARY, proxy_location_fields, NULL
+  base::Value::TYPE_DICTIONARY, proxy_location_fields, NULL
 };
 const OncValueSignature kProxyManualSignature = {
-  Value::TYPE_DICTIONARY, proxy_manual_fields, NULL
+  base::Value::TYPE_DICTIONARY, proxy_manual_fields, NULL
 };
 const OncValueSignature kProxySettingsSignature = {
-  Value::TYPE_DICTIONARY, proxy_settings_fields, NULL
+  base::Value::TYPE_DICTIONARY, proxy_settings_fields, NULL
 };
 const OncValueSignature kWiFiSignature = {
-  Value::TYPE_DICTIONARY, wifi_fields, NULL
+  base::Value::TYPE_DICTIONARY, wifi_fields, NULL
 };
 const OncValueSignature kCertificateSignature = {
-  Value::TYPE_DICTIONARY, certificate_fields, NULL
+  base::Value::TYPE_DICTIONARY, certificate_fields, NULL
 };
 const OncValueSignature kNetworkConfigurationSignature = {
-  Value::TYPE_DICTIONARY, network_configuration_fields, NULL
+  base::Value::TYPE_DICTIONARY, network_configuration_fields, NULL
 };
 const OncValueSignature kGlobalNetworkConfigurationSignature = {
-  Value::TYPE_DICTIONARY, global_network_configuration_fields, NULL
+  base::Value::TYPE_DICTIONARY, global_network_configuration_fields, NULL
 };
 const OncValueSignature kCertificateListSignature = {
-  Value::TYPE_LIST, NULL, &kCertificateSignature
+  base::Value::TYPE_LIST, NULL, &kCertificateSignature
 };
 const OncValueSignature kNetworkConfigurationListSignature = {
-  Value::TYPE_LIST, NULL, &kNetworkConfigurationSignature
+  base::Value::TYPE_LIST, NULL, &kNetworkConfigurationSignature
 };
 const OncValueSignature kToplevelConfigurationSignature = {
-  Value::TYPE_DICTIONARY, toplevel_configuration_fields, NULL
+  base::Value::TYPE_DICTIONARY, toplevel_configuration_fields, NULL
 };
 
 // Derived "ONC with State" signatures.
 const OncValueSignature kNetworkWithStateSignature = {
-  Value::TYPE_DICTIONARY, network_with_state_fields, NULL,
+  base::Value::TYPE_DICTIONARY, network_with_state_fields, NULL,
   &kNetworkConfigurationSignature
 };
 const OncValueSignature kWiFiWithStateSignature = {
-  Value::TYPE_DICTIONARY, wifi_with_state_fields, NULL, &kWiFiSignature
+  base::Value::TYPE_DICTIONARY, wifi_with_state_fields, NULL, &kWiFiSignature
 };
 const OncValueSignature kCellularSignature = {
-  Value::TYPE_DICTIONARY, cellular_fields, NULL
+  base::Value::TYPE_DICTIONARY, cellular_fields, NULL
 };
 const OncValueSignature kCellularWithStateSignature = {
-  Value::TYPE_DICTIONARY, cellular_with_state_fields, NULL, &kCellularSignature
+  base::Value::TYPE_DICTIONARY, cellular_with_state_fields, NULL,
+  &kCellularSignature
 };
 const OncValueSignature kCellularProviderSignature = {
-  Value::TYPE_DICTIONARY, cellular_provider_fields, NULL
+  base::Value::TYPE_DICTIONARY, cellular_provider_fields, NULL
 };
 const OncValueSignature kCellularApnSignature = {
-  Value::TYPE_DICTIONARY, cellular_apn_fields, NULL
+  base::Value::TYPE_DICTIONARY, cellular_apn_fields, NULL
 };
 
 const OncFieldSignature* GetFieldSignature(const OncValueSignature& signature,

diff --git a/chromeos/network/onc/onc_translator_shill_to_onc.cc b/chromeos/network/onc/onc_translator_shill_to_onc.cc
@@ -316,7 +316,7 @@ void ShillToONCTranslator::TranslateAndAddListOfObjects(
     const base::ListValue& list) {
   const OncFieldSignature* field_signature =
       GetFieldSignature(*onc_signature_, onc_field_name);
-  if (field_signature->value_signature->onc_type != Value::TYPE_LIST) {
+  if (field_signature->value_signature->onc_type != base::Value::TYPE_LIST) {
     LOG(ERROR) << "ONC Field name: '" << onc_field_name << "' has type '"
                << field_signature->value_signature->onc_type
                << "', expected: base::Value::TYPE_LIST.";

diff --git a/chromeos/network/shill_property_handler.cc b/chromeos/network/shill_property_handler.cc
@@ -299,7 +299,7 @@ void ShillPropertyHandler::ManagerPropertyChanged(const std::string& key,
       UpdateObserved(ManagedState::MANAGED_TYPE_NETWORK, *vlist);
     }
   } else if (key == shill::kServiceCompleteListProperty) {
-    const ListValue* vlist = GetListValue(key, value);
+    const base::ListValue* vlist = GetListValue(key, value);
     if (vlist) {
       listener_->UpdateManagedList(ManagedState::MANAGED_TYPE_FAVORITE, *vlist);
       UpdateProperties(ManagedState::MANAGED_TYPE_FAVORITE, *vlist);

diff --git a/cloud_print/gcp20/prototype/cloud_print_requester.cc b/cloud_print/gcp20/prototype/cloud_print_requester.cc
@@ -78,7 +78,7 @@ GURL CreateUpdateUrl(const std::string& device_id) {
 
 std::string LocalSettingsToJson(const LocalSettings& settings) {
   base::DictionaryValue dictionary;
-  scoped_ptr<base::DictionaryValue> current(new DictionaryValue);
+  scoped_ptr<base::DictionaryValue> current(new base::DictionaryValue);
 
   // TODO(maksymb): Formalize text as constants.
   current->SetBoolean("local_discovery", settings.local_discovery);

diff --git a/cloud_print/gcp20/prototype/privet_http_server.cc b/cloud_print/gcp20/prototype/privet_http_server.cc
@@ -302,7 +302,7 @@ scoped_ptr<base::DictionaryValue> PrivetHttpServer::ProcessCreateJob(
   *status_code = net::HTTP_OK;
   switch (result) {
     case LocalPrintJob::CREATE_SUCCESS:
-      response.reset(new DictionaryValue);
+      response.reset(new base::DictionaryValue);
       response->SetString("job_id", job_id);
       response->SetInteger("expires_in", expires_in);
       return response.Pass();
@@ -354,7 +354,7 @@ scoped_ptr<base::DictionaryValue> PrivetHttpServer::ProcessSubmitDoc(
 
   // Create response
   *status_code = net::HTTP_OK;
-  scoped_ptr<base::DictionaryValue> response(new DictionaryValue);
+  scoped_ptr<base::DictionaryValue> response(new base::DictionaryValue);
   switch (status) {
     case LocalPrintJob::SAVE_SUCCESS:
       response->SetString("job_id", job_id);
@@ -422,7 +422,7 @@ scoped_ptr<base::DictionaryValue> PrivetHttpServer::ProcessRegister(
       !user.empty();
 
   RegistrationErrorStatus status = REG_ERROR_INVALID_PARAMS;
-  scoped_ptr<base::DictionaryValue> response(new DictionaryValue);
+  scoped_ptr<base::DictionaryValue> response(new base::DictionaryValue);
 
   if (params_present) {
     response->SetString("action", action);

diff --git a/cloud_print/service/service_state.cc b/cloud_print/service/service_state.cc
@@ -135,9 +135,9 @@ bool ServiceState::IsValid() const {
 }
 
 std::string ServiceState::ToString() {
-  scoped_ptr<base::DictionaryValue> services(new DictionaryValue());
+  scoped_ptr<base::DictionaryValue> services(new base::DictionaryValue());
 
-  scoped_ptr<base::DictionaryValue> cloud_print(new DictionaryValue());
+  scoped_ptr<base::DictionaryValue> cloud_print(new base::DictionaryValue());
   cloud_print->SetBoolean(kEnabledOptionName, true);
 
   SetNotEmptyJsonString(cloud_print.get(), kEmailOptionName, email_);

diff --git a/components/autofill/content/browser/wallet/full_wallet.cc b/components/autofill/content/browser/wallet/full_wallet.cc
@@ -44,8 +44,8 @@ FullWallet::~FullWallet() {}
 
 // static
 scoped_ptr<FullWallet>
-    FullWallet::CreateFullWallet(const DictionaryValue& dictionary) {
-  const ListValue* required_actions_list;
+    FullWallet::CreateFullWallet(const base::DictionaryValue& dictionary) {
+  const base::ListValue* required_actions_list;
   std::vector<RequiredAction> required_actions;
   if (dictionary.GetList("required_action", &required_actions_list)) {
     for (size_t i = 0; i < required_actions_list->GetSize(); ++i) {
@@ -97,7 +97,7 @@ scoped_ptr<FullWallet>
     return scoped_ptr<FullWallet>();
   }
 
-  const DictionaryValue* billing_address_dict;
+  const base::DictionaryValue* billing_address_dict;
   if (!dictionary.GetDictionary("billing_address", &billing_address_dict)) {
     DLOG(ERROR) << "Response from Google wallet missing billing address";
     return scoped_ptr<FullWallet>();
@@ -110,7 +110,7 @@ scoped_ptr<FullWallet>
     return scoped_ptr<FullWallet>();
   }
 
-  const DictionaryValue* shipping_address_dict;
+  const base::DictionaryValue* shipping_address_dict;
   scoped_ptr<Address> shipping_address;
   if (dictionary.GetDictionary("shipping_address", &shipping_address_dict)) {
     shipping_address =

diff --git a/components/autofill/content/browser/wallet/full_wallet_unittest.cc b/components/autofill/content/browser/wallet/full_wallet_unittest.cc
@@ -355,12 +355,12 @@ class FullWalletTest : public testing::Test {
   FullWalletTest() {}
  protected:
   void SetUpDictionary(const std::string& json) {
-    scoped_ptr<Value> value(base::JSONReader::Read(json));
+    scoped_ptr<base::Value> value(base::JSONReader::Read(json));
     ASSERT_TRUE(value.get());
-    ASSERT_TRUE(value->IsType(Value::TYPE_DICTIONARY));
-    dict.reset(static_cast<DictionaryValue*>(value.release()));
+    ASSERT_TRUE(value->IsType(base::Value::TYPE_DICTIONARY));
+    dict.reset(static_cast<base::DictionaryValue*>(value.release()));
   }
-  scoped_ptr<DictionaryValue> dict;
+  scoped_ptr<base::DictionaryValue> dict;
 };
 
 TEST_F(FullWalletTest, CreateFullWalletMissingExpirationMonth) {

diff --git a/components/autofill/content/browser/wallet/wallet_address.cc b/components/autofill/content/browser/wallet/wallet_address.cc
@@ -51,7 +51,7 @@ Address* CreateAddressInternal(const base::DictionaryValue& dictionary,
 
   base::string16 address_line_1;
   base::string16 address_line_2;
-  const ListValue* address_line_list;
+  const base::ListValue* address_line_list;
   if (dictionary.GetList("postal_address.address_line", &address_line_list)) {
     if (!address_line_list->GetString(0, &address_line_1))
       DVLOG(1) << "Response from Google Wallet missing address line 1";