diff options
author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-23 22:23:08 +0000 |
---|---|---|
committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-23 22:23:08 +0000 |
commit | 4b3006f0ecb22cd179404810dc3580ccf5fa129d (patch) | |
tree | 84e36a40831bc716becc4e8df5729727b6fe8641 /extensions | |
parent | 85ecd7e2a7efe7fd05d1803412bfe46d8b3bd9d0 (diff) | |
download | chromium_src-4b3006f0ecb22cd179404810dc3580ccf5fa129d.zip chromium_src-4b3006f0ecb22cd179404810dc3580ccf5fa129d.tar.gz chromium_src-4b3006f0ecb22cd179404810dc3580ccf5fa129d.tar.bz2 |
Update uses of Value in extensions/, google_apis/, gpu/, media/, net/, printing/, remoting/, rlz/, sync/, ui/ to use the base:: namespace.
BUG=88666
TEST=no change
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/116433007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242410 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/browser/event_router.h | 4 | ||||
-rw-r--r-- | extensions/browser/extension_function.cc | 4 | ||||
-rw-r--r-- | extensions/browser/info_map_unittest.cc | 6 | ||||
-rw-r--r-- | extensions/common/event_filter_unittest.cc | 4 | ||||
-rw-r--r-- | extensions/common/url_pattern_set.cc | 4 |
5 files changed, 13 insertions, 9 deletions
diff --git a/extensions/browser/event_router.h b/extensions/browser/event_router.h index d65adb0..7052389 100644 --- a/extensions/browser/event_router.h +++ b/extensions/browser/event_router.h @@ -374,12 +374,12 @@ struct EventListenerInfo { struct EventDispatchInfo { EventDispatchInfo(const std::string& extension_id, const std::string& event_name, - scoped_ptr<ListValue> event_args); + scoped_ptr<base::ListValue> event_args); ~EventDispatchInfo(); const std::string extension_id; const std::string event_name; - scoped_ptr<ListValue> event_args; + scoped_ptr<base::ListValue> event_args; }; } // namespace extensions diff --git a/extensions/browser/extension_function.cc b/extensions/browser/extension_function.cc index d1e2a9f..be5192d 100644 --- a/extensions/browser/extension_function.cc +++ b/extensions/browser/extension_function.cc @@ -136,8 +136,8 @@ bool ExtensionFunction::ShouldSkipQuotaLimiting() const { } bool ExtensionFunction::HasOptionalArgument(size_t index) { - Value* value; - return args_->Get(index, &value) && !value->IsType(Value::TYPE_NULL); + base::Value* value; + return args_->Get(index, &value) && !value->IsType(base::Value::TYPE_NULL); } void ExtensionFunction::SendResponseImpl(bool success) { diff --git a/extensions/browser/info_map_unittest.cc b/extensions/browser/info_map_unittest.cc index 8eaf488..d01fa61 100644 --- a/extensions/browser/info_map_unittest.cc +++ b/extensions/browser/info_map_unittest.cc @@ -38,7 +38,7 @@ static scoped_refptr<Extension> CreateExtension(const std::string& name) { base::FilePath path(FILE_PATH_LITERAL("/foo")); #endif - DictionaryValue manifest; + base::DictionaryValue manifest; manifest.SetString(keys::kVersion, "1.0.0.0"); manifest.SetString(keys::kName, name); @@ -61,7 +61,7 @@ static scoped_refptr<Extension> LoadManifest(const std::string& dir, path = path.AppendASCII("extensions").AppendASCII(dir).AppendASCII(test_file); JSONFileValueSerializer serializer(path); - scoped_ptr<Value> result(serializer.Deserialize(NULL, NULL)); + scoped_ptr<base::Value> result(serializer.Deserialize(NULL, NULL)); if (!result) return NULL; @@ -69,7 +69,7 @@ static scoped_refptr<Extension> LoadManifest(const std::string& dir, scoped_refptr<Extension> extension = Extension::Create(path, Manifest::INVALID_LOCATION, - *static_cast<DictionaryValue*>(result.get()), + *static_cast<base::DictionaryValue*>(result.get()), Extension::NO_FLAGS, &error); EXPECT_TRUE(extension.get()) << error; diff --git a/extensions/common/event_filter_unittest.cc b/extensions/common/event_filter_unittest.cc index 3f7f12b..f95c023 100644 --- a/extensions/common/event_filter_unittest.cc +++ b/extensions/common/event_filter_unittest.cc @@ -10,6 +10,10 @@ #include "ipc/ipc_message.h" #include "testing/gtest/include/gtest/gtest.h" +using base::DictionaryValue; +using base::ListValue; +using base::Value; + namespace extensions { class EventFilterUnittest : public testing::Test { diff --git a/extensions/common/url_pattern_set.cc b/extensions/common/url_pattern_set.cc index db5b4eb..1d29497 100644 --- a/extensions/common/url_pattern_set.cc +++ b/extensions/common/url_pattern_set.cc @@ -183,10 +183,10 @@ bool URLPatternSet::OverlapsWith(const URLPatternSet& other) const { } scoped_ptr<base::ListValue> URLPatternSet::ToValue() const { - scoped_ptr<ListValue> value(new ListValue); + scoped_ptr<base::ListValue> value(new base::ListValue); for (URLPatternSet::const_iterator i = patterns_.begin(); i != patterns_.end(); ++i) - value->AppendIfNotPresent(Value::CreateStringValue(i->GetAsString())); + value->AppendIfNotPresent(base::Value::CreateStringValue(i->GetAsString())); return value.Pass(); } |