| Index: chrome/browser/extensions/user_script_listener_unittest.cc
|
| diff --git a/chrome/browser/extensions/user_script_listener_unittest.cc b/chrome/browser/extensions/user_script_listener_unittest.cc
|
| index 0e530d444bfb876ed1a41b9d7617d0c173efa521..34c31f4fe27a9b65edd13e05144fa3f1e0639c6b 100644
|
| --- a/chrome/browser/extensions/user_script_listener_unittest.cc
|
| +++ b/chrome/browser/extensions/user_script_listener_unittest.cc
|
| @@ -78,11 +78,12 @@ class SimpleTestJob : public net::URLRequestTestJob {
|
| };
|
|
|
| // Yoinked from extension_manifest_unittest.cc.
|
| -DictionaryValue* LoadManifestFile(const base::FilePath path,
|
| - std::string* error) {
|
| +base::DictionaryValue* LoadManifestFile(const base::FilePath path,
|
| + std::string* error) {
|
| EXPECT_TRUE(base::PathExists(path));
|
| JSONFileValueSerializer serializer(path);
|
| - return static_cast<DictionaryValue*>(serializer.Deserialize(NULL, error));
|
| + return static_cast<base::DictionaryValue*>(
|
| + serializer.Deserialize(NULL, error));
|
| }
|
|
|
| scoped_refptr<Extension> LoadExtension(const std::string& filename,
|
| @@ -93,7 +94,7 @@ scoped_refptr<Extension> LoadExtension(const std::string& filename,
|
| AppendASCII("extensions").
|
| AppendASCII("manifest_tests").
|
| AppendASCII(filename.c_str());
|
| - scoped_ptr<DictionaryValue> value(LoadManifestFile(path, error));
|
| + scoped_ptr<base::DictionaryValue> value(LoadManifestFile(path, error));
|
| if (!value)
|
| return NULL;
|
| return Extension::Create(path.DirName(), Manifest::UNPACKED, *value,
|
|
|