diff options
author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-23 21:58:45 +0000 |
---|---|---|
committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-23 21:58:45 +0000 |
commit | 85ecd7e2a7efe7fd05d1803412bfe46d8b3bd9d0 (patch) | |
tree | 945304a53f7fe9aa4df18620e55cb6d067604ea7 /components/url_matcher | |
parent | e53a7f29591f8b3f03f97541b3b30422780b39a6 (diff) | |
download | chromium_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 'components/url_matcher')
-rw-r--r-- | components/url_matcher/url_matcher_factory.cc | 6 | ||||
-rw-r--r-- | components/url_matcher/url_matcher_factory_unittest.cc | 48 | ||||
-rw-r--r-- | components/url_matcher/url_matcher_helpers.cc | 2 |
3 files changed, 28 insertions, 28 deletions
diff --git a/components/url_matcher/url_matcher_factory.cc b/components/url_matcher/url_matcher_factory.cc index ab1c365..f36e452 100644 --- a/components/url_matcher/url_matcher_factory.cc +++ b/components/url_matcher/url_matcher_factory.cc @@ -114,7 +114,7 @@ URLMatcherFactory::CreateFromURLFilterDictionary( for (base::DictionaryValue::Iterator iter(*url_filter_dict); !iter.IsAtEnd(); iter.Advance()) { const std::string& condition_attribute_name = iter.key(); - const Value& condition_attribute_value = iter.value(); + const base::Value& condition_attribute_value = iter.value(); if (IsURLMatcherConditionAttribute(condition_attribute_name)) { // Handle {host, path, ...}{Prefix, Suffix, Contains, Equals}. URLMatcherCondition url_matcher_condition = @@ -245,9 +245,9 @@ scoped_ptr<URLMatcherPortFilter> URLMatcherFactory::CreateURLMatcherPorts( return scoped_ptr<URLMatcherPortFilter>(); } - for (ListValue::const_iterator i = value_list->begin(); + for (base::ListValue::const_iterator i = value_list->begin(); i != value_list->end(); ++i) { - Value* entry = *i; + base::Value* entry = *i; int port = 0; base::ListValue* range = NULL; if (entry->GetAsInteger(&port)) { diff --git a/components/url_matcher/url_matcher_factory_unittest.cc b/components/url_matcher/url_matcher_factory_unittest.cc index 9d6632e..697432e 100644 --- a/components/url_matcher/url_matcher_factory_unittest.cc +++ b/components/url_matcher/url_matcher_factory_unittest.cc @@ -23,19 +23,19 @@ TEST(URLMatcherFactoryTest, CreateFromURLFilterDictionary) { scoped_refptr<URLMatcherConditionSet> result; // Invalid key: {"invalid": "foobar"} - DictionaryValue invalid_condition; + base::DictionaryValue invalid_condition; invalid_condition.SetString("invalid", "foobar"); // Invalid value type: {"hostSuffix": []} - DictionaryValue invalid_condition2; - invalid_condition2.Set(keys::kHostSuffixKey, new ListValue); + base::DictionaryValue invalid_condition2; + invalid_condition2.Set(keys::kHostSuffixKey, new base::ListValue); // Invalid regex value: {"urlMatches": "*"} - DictionaryValue invalid_condition3; + base::DictionaryValue invalid_condition3; invalid_condition3.SetString(keys::kURLMatchesKey, "*"); // Invalid regex value: {"originAndPathMatches": "*"} - DictionaryValue invalid_condition4; + base::DictionaryValue invalid_condition4; invalid_condition4.SetString(keys::kOriginAndPathMatchesKey, "*"); // Valid values: @@ -47,17 +47,17 @@ TEST(URLMatcherFactoryTest, CreateFromURLFilterDictionary) { // } // Port range: Allow 80;1000-1010. - ListValue* port_range = new ListValue(); - port_range->Append(Value::CreateIntegerValue(1000)); - port_range->Append(Value::CreateIntegerValue(1010)); - ListValue* port_ranges = new ListValue(); - port_ranges->Append(Value::CreateIntegerValue(80)); + base::ListValue* port_range = new base::ListValue(); + port_range->Append(base::Value::CreateIntegerValue(1000)); + port_range->Append(base::Value::CreateIntegerValue(1010)); + base::ListValue* port_ranges = new base::ListValue(); + port_ranges->Append(base::Value::CreateIntegerValue(80)); port_ranges->Append(port_range); - ListValue* scheme_list = new ListValue(); - scheme_list->Append(Value::CreateStringValue("http")); + base::ListValue* scheme_list = new base::ListValue(); + scheme_list->Append(base::Value::CreateStringValue("http")); - DictionaryValue valid_condition; + base::DictionaryValue valid_condition; valid_condition.SetString(keys::kHostSuffixKey, "example.com"); valid_condition.SetString(keys::kHostPrefixKey, "www"); valid_condition.Set(keys::kPortsKey, port_ranges); @@ -120,28 +120,28 @@ TEST(URLMatcherFactoryTest, UpperCase) { scoped_refptr<URLMatcherConditionSet> result; // {"hostContains": "exaMple"} - DictionaryValue invalid_condition1; + base::DictionaryValue invalid_condition1; invalid_condition1.SetString(keys::kHostContainsKey, "exaMple"); // {"hostSuffix": ".Com"} - DictionaryValue invalid_condition2; + base::DictionaryValue invalid_condition2; invalid_condition2.SetString(keys::kHostSuffixKey, ".Com"); // {"hostPrefix": "WWw."} - DictionaryValue invalid_condition3; + base::DictionaryValue invalid_condition3; invalid_condition3.SetString(keys::kHostPrefixKey, "WWw."); // {"hostEquals": "WWW.example.Com"} - DictionaryValue invalid_condition4; + base::DictionaryValue invalid_condition4; invalid_condition4.SetString(keys::kHostEqualsKey, "WWW.example.Com"); // {"scheme": ["HTTP"]} - ListValue* scheme_list = new ListValue(); - scheme_list->Append(Value::CreateStringValue("HTTP")); - DictionaryValue invalid_condition5; + base::ListValue* scheme_list = new base::ListValue(); + scheme_list->Append(base::Value::CreateStringValue("HTTP")); + base::DictionaryValue invalid_condition5; invalid_condition5.Set(keys::kSchemesKey, scheme_list); - const DictionaryValue* invalid_conditions[] = { + const base::DictionaryValue* invalid_conditions[] = { &invalid_condition1, &invalid_condition2, &invalid_condition3, @@ -227,10 +227,10 @@ void UrlConditionCaseTest::Test() const { void UrlConditionCaseTest::CheckCondition( const std::string& value, UrlConditionCaseTest::ResultType expected_result) const { - DictionaryValue condition; + base::DictionaryValue condition; if (use_list_of_strings_) { - ListValue* list = new ListValue(); - list->Append(Value::CreateStringValue(value)); + base::ListValue* list = new base::ListValue(); + list->Append(base::Value::CreateStringValue(value)); condition.SetWithoutPathExpansion(condition_key_, list); } else { condition.SetStringWithoutPathExpansion(condition_key_, value); diff --git a/components/url_matcher/url_matcher_helpers.cc b/components/url_matcher/url_matcher_helpers.cc index 61358e7..6eab51d 100644 --- a/components/url_matcher/url_matcher_helpers.cc +++ b/components/url_matcher/url_matcher_helpers.cc @@ -13,7 +13,7 @@ namespace url_matcher_helpers { // successful. bool GetAsStringVector(const base::Value* value, std::vector<std::string>* out) { - const ListValue* value_as_list = 0; + const base::ListValue* value_as_list = 0; if (!value->GetAsList(&value_as_list)) return false; |