summaryrefslogtreecommitdiffstats
path: root/chromeos
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-23 21:58:45 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-23 21:58:45 +0000
commit85ecd7e2a7efe7fd05d1803412bfe46d8b3bd9d0 (patch)
tree945304a53f7fe9aa4df18620e55cb6d067604ea7 /chromeos
parente53a7f29591f8b3f03f97541b3b30422780b39a6 (diff)
downloadchromium_src-85ecd7e2a7efe7fd05d1803412bfe46d8b3bd9d0.zip
chromium_src-85ecd7e2a7efe7fd05d1803412bfe46d8b3bd9d0.tar.gz
chromium_src-85ecd7e2a7efe7fd05d1803412bfe46d8b3bd9d0.tar.bz2
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
Diffstat (limited to 'chromeos')
-rw-r--r--chromeos/dbus/nfc_device_client.cc2
-rw-r--r--chromeos/dbus/nfc_tag_client.cc2
-rw-r--r--chromeos/network/device_state.h4
-rw-r--r--chromeos/network/network_configuration_handler_unittest.cc2
-rw-r--r--chromeos/network/network_device_handler_impl.cc2
-rw-r--r--chromeos/network/network_state_unittest.cc2
-rw-r--r--chromeos/network/network_util.cc10
-rw-r--r--chromeos/network/network_util.h2
-rw-r--r--chromeos/network/network_util_unittest.cc8
-rw-r--r--chromeos/network/onc/onc_signature.cc69
-rw-r--r--chromeos/network/onc/onc_translator_shill_to_onc.cc2
-rw-r--r--chromeos/network/shill_property_handler.cc2
12 files changed, 55 insertions, 52 deletions
diff --git a/chromeos/dbus/nfc_device_client.cc b/chromeos/dbus/nfc_device_client.cc
index b539ce4..e9833c9 100644
--- 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
index 8de4c27..de7e1ef 100644
--- 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
index 33bc847..f0d622f 100644
--- 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
index 851914a..a217634 100644
--- 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
index 206fddf..cf8f036 100644
--- 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
index 642d77f..a36c66d 100644
--- 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
index 8b1ff44..1acf6e5 100644
--- 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
index 8a18ab3..7c95238 100644
--- 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
index f668cf3..9ccf8e6 100644
--- 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
index b0e9656..44edc31 100644
--- 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
index 1c1c2e8..e52e731 100644
--- 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
index 80bf21e..7ece2f6 100644
--- 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);