1 files changed, 12 insertions, 11 deletions
diff --git a/chrome/browser/extensions/external_pref_loader.cc b/chrome/browser/extensions/external_pref_loader.cc
index 567fdb2..81b68e6 100644
--- a/chrome/browser/extensions/external_pref_loader.cc
+++ b/chrome/browser/extensions/external_pref_loader.cc
@@ -67,23 +67,23 @@ std::set<base::FilePath> GetPrefsCandidateFilesFromFolder(
 // occurs). An empty dictionary is returned in case of failure (e.g. invalid
 // path or json content).
 // Caller takes ownership of the returned dictionary.
-DictionaryValue* ExtractExtensionPrefs(base::ValueSerializer* serializer,
-                                       const base::FilePath& path) {
+base::DictionaryValue* ExtractExtensionPrefs(base::ValueSerializer* serializer,
+                                             const base::FilePath& path) {
   std::string error_msg;
-  Value* extensions = serializer->Deserialize(NULL, &error_msg);
+  base::Value* extensions = serializer->Deserialize(NULL, &error_msg);
   if (!extensions) {
     LOG(WARNING) << "Unable to deserialize json data: " << error_msg
                  << " in file " << path.value() << ".";
-    return new DictionaryValue;
+    return new base::DictionaryValue;
   }
 
-  DictionaryValue* ext_dictionary = NULL;
+  base::DictionaryValue* ext_dictionary = NULL;
   if (extensions->GetAsDictionary(&ext_dictionary))
     return ext_dictionary;
 
   LOG(WARNING) << "Expected a JSON dictionary in file "
                << path.value() << ".";
-  return new DictionaryValue;
+  return new base::DictionaryValue;
 }
 
 }  // namespace
@@ -112,7 +112,7 @@ void ExternalPrefLoader::StartLoading() {
 void ExternalPrefLoader::LoadOnFileThread() {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
-  scoped_ptr<DictionaryValue> prefs(new DictionaryValue);
+  scoped_ptr<base::DictionaryValue> prefs(new base::DictionaryValue);
 
   // TODO(skerner): Some values of base_path_id_ will cause
   // PathService::Get() to return false, because the path does
@@ -150,7 +150,8 @@ void ExternalPrefLoader::LoadOnFileThread() {
       base::Bind(&ExternalPrefLoader::LoadFinished, this));
 }
 
-void ExternalPrefLoader::ReadExternalExtensionPrefFile(DictionaryValue* prefs) {
+void ExternalPrefLoader::ReadExternalExtensionPrefFile(
+    base::DictionaryValue* prefs) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   CHECK(NULL != prefs);
 
@@ -181,14 +182,14 @@ void ExternalPrefLoader::ReadExternalExtensionPrefFile(DictionaryValue* prefs) {
   }
 
   JSONFileValueSerializer serializer(json_file);
-  scoped_ptr<DictionaryValue> ext_prefs(
+  scoped_ptr<base::DictionaryValue> ext_prefs(
       ExtractExtensionPrefs(&serializer, json_file));
   if (ext_prefs)
     prefs->MergeDictionary(ext_prefs.get());
 }
 
 void ExternalPrefLoader::ReadStandaloneExtensionPrefFiles(
-    DictionaryValue* prefs) {
+    base::DictionaryValue* prefs) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   CHECK(NULL != prefs);
 
@@ -219,7 +220,7 @@ void ExternalPrefLoader::ReadStandaloneExtensionPrefFiles(
              << extension_candidate_path.LossyDisplayName().c_str();
 
     JSONFileValueSerializer serializer(extension_candidate_path);
-    scoped_ptr<DictionaryValue> ext_prefs(
+    scoped_ptr<base::DictionaryValue> ext_prefs(
         ExtractExtensionPrefs(&serializer, extension_candidate_path));
     if (ext_prefs) {
       DVLOG(1) << "Adding extension with id: " << id;