Make base use the proper Value namespace

base/prefs/json_pref_store.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/prefs/json_pref_store.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 43 matching lines @@
         FROM_HERE,
         base::Bind(&FileThreadDeserializer::ReportOnOriginThread, this));
   }
 
   // Reports deserialization result on the origin thread.
   void ReportOnOriginThread() {
     DCHECK(origin_loop_proxy_->BelongsToCurrentThread());
     delegate_->OnFileRead(value_.release(), error_, no_dir_);
   }
 
-  static Value* DoReading(const base::FilePath& path,
-                          PersistentPrefStore::PrefReadError* error,
-                          bool* no_dir) {
+  static base::Value* DoReading(const base::FilePath& path,
+                                PersistentPrefStore::PrefReadError* error,
+                                bool* no_dir) {
     int error_code;
     std::string error_msg;
     JSONFileValueSerializer serializer(path);
-    Value* value = serializer.Deserialize(&error_code, &error_msg);
+    base::Value* value = serializer.Deserialize(&error_code, &error_msg);
     HandleErrors(value, path, error_code, error_msg, error);
     *no_dir = !file_util::PathExists(path.DirName());
     return value;
   }
 
-  static void HandleErrors(const Value* value,
+  static void HandleErrors(const base::Value* value,
                            const base::FilePath& path,
                            int error_code,
                            const std::string& error_msg,
                            PersistentPrefStore::PrefReadError* error);
 
  private:
   friend class base::RefCountedThreadSafe<FileThreadDeserializer>;
   ~FileThreadDeserializer() {}
 
   bool no_dir_;
   PersistentPrefStore::PrefReadError error_;
-  scoped_ptr<Value> value_;
+  scoped_ptr<base::Value> value_;
   const scoped_refptr<JsonPrefStore> delegate_;
   const scoped_refptr<base::SequencedTaskRunner> sequenced_task_runner_;
   const scoped_refptr<base::MessageLoopProxy> origin_loop_proxy_;
 };
 
 // static
 void FileThreadDeserializer::HandleErrors(
-    const Value* value,
+    const base::Value* value,
     const base::FilePath& path,
     int error_code,
     const std::string& error_msg,
     PersistentPrefStore::PrefReadError* error) {
   *error = PersistentPrefStore::PREF_READ_ERROR_NONE;
   if (!value) {
     DVLOG(1) << "Error while loading JSON file: " << error_msg
              << ", file: " << path.value();
     switch (error_code) {
       case JSONFileValueSerializer::JSON_ACCESS_DENIED:
@@ skipping 19 matching lines @@
         base::FilePath bad = path.ReplaceExtension(kBadExtension);
 
         // If they've ever had a parse error before, put them in another bucket.
         // TODO(erikkay) if we keep this error checking for very long, we may
         // want to differentiate between recent and long ago errors.
         if (file_util::PathExists(bad))
           *error = PersistentPrefStore::PREF_READ_ERROR_JSON_REPEAT;
         file_util::Move(path, bad);
         break;
     }
-  } else if (!value->IsType(Value::TYPE_DICTIONARY)) {
+  } else if (!value->IsType(base::Value::TYPE_DICTIONARY)) {
     *error = PersistentPrefStore::PREF_READ_ERROR_JSON_TYPE;
   }
 }
 
 }  // namespace
 
 scoped_refptr<base::SequencedTaskRunner> JsonPrefStore::GetTaskRunnerForFile(
     const base::FilePath& filename,
     base::SequencedWorkerPool* worker_pool) {
   std::string token("json_pref_store-");
   token.append(filename.AsUTF8Unsafe());
   return worker_pool->GetSequencedTaskRunnerWithShutdownBehavior(
       worker_pool->GetNamedSequenceToken(token),
       base::SequencedWorkerPool::BLOCK_SHUTDOWN);
 }
 
 JsonPrefStore::JsonPrefStore(const base::FilePath& filename,
                              base::SequencedTaskRunner* sequenced_task_runner)
     : path_(filename),
       sequenced_task_runner_(sequenced_task_runner),
-      prefs_(new DictionaryValue()),
+      prefs_(new base::DictionaryValue()),
       read_only_(false),
       writer_(filename, sequenced_task_runner),
       initialized_(false),
       read_error_(PREF_READ_ERROR_OTHER) {}
 
 bool JsonPrefStore::GetValue(const std::string& key,
-                             const Value** result) const {
-  Value* tmp = NULL;
+                             const base::Value** result) const {
+  base::Value* tmp = NULL;
   if (!prefs_->Get(key, &tmp))
     return false;
 
   if (result)
     *result = tmp;
   return true;
 }
 
 void JsonPrefStore::AddObserver(PrefStore::Observer* observer) {
   observers_.AddObserver(observer);
 }
 
 void JsonPrefStore::RemoveObserver(PrefStore::Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
 size_t JsonPrefStore::NumberOfObservers() const {
   return observers_.size();
 }
 
 bool JsonPrefStore::IsInitializationComplete() const {
   return initialized_;
 }
 
 bool JsonPrefStore::GetMutableValue(const std::string& key,
-                                    Value** result) {
+                                    base::Value** result) {
   return prefs_->Get(key, result);
 }
 
-void JsonPrefStore::SetValue(const std::string& key, Value* value) {
+void JsonPrefStore::SetValue(const std::string& key, base::Value* value) {
   DCHECK(value);
-  scoped_ptr<Value> new_value(value);
-  Value* old_value = NULL;
+  scoped_ptr<base::Value> new_value(value);
+  base::Value* old_value = NULL;
   prefs_->Get(key, &old_value);
   if (!old_value || !value->Equals(old_value)) {
     prefs_->Set(key, new_value.release());
     ReportValueChanged(key);
   }
 }
 
-void JsonPrefStore::SetValueSilently(const std::string& key, Value* value) {
+void JsonPrefStore::SetValueSilently(const std::string& key,
+                                     base::Value* value) {
   DCHECK(value);
-  scoped_ptr<Value> new_value(value);
-  Value* old_value = NULL;
+  scoped_ptr<base::Value> new_value(value);
+  base::Value* old_value = NULL;
   prefs_->Get(key, &old_value);
   if (!old_value || !value->Equals(old_value)) {
     prefs_->Set(key, new_value.release());
     if (!read_only_)
       writer_.ScheduleWrite(this);
   }
 }
 
 void JsonPrefStore::RemoveValue(const std::string& key) {
   if (prefs_->Remove(key, NULL))
@@ skipping 13 matching lines @@
 }
 
 PersistentPrefStore::PrefReadError JsonPrefStore::ReadPrefs() {
   if (path_.empty()) {
     OnFileRead(NULL, PREF_READ_ERROR_FILE_NOT_SPECIFIED, false);
     return PREF_READ_ERROR_FILE_NOT_SPECIFIED;
   }
 
   PrefReadError error;
   bool no_dir;
-  Value* value = FileThreadDeserializer::DoReading(path_, &error, &no_dir);
+  base::Value* value =
+      FileThreadDeserializer::DoReading(path_, &error, &no_dir);
   OnFileRead(value, error, no_dir);
   return error;
 }
 
 void JsonPrefStore::ReadPrefsAsync(ReadErrorDelegate *error_delegate) {
   initialized_ = false;
   error_delegate_.reset(error_delegate);
   if (path_.empty()) {
     OnFileRead(NULL, PREF_READ_ERROR_FILE_NOT_SPECIFIED, false);
     return;
@@ skipping 10 matching lines @@
   if (writer_.HasPendingWrite() && !read_only_)
     writer_.DoScheduledWrite();
 }
 
 void JsonPrefStore::ReportValueChanged(const std::string& key) {
   FOR_EACH_OBSERVER(PrefStore::Observer, observers_, OnPrefValueChanged(key));
   if (!read_only_)
     writer_.ScheduleWrite(this);
 }
 
-void JsonPrefStore::OnFileRead(Value* value_owned,
+void JsonPrefStore::OnFileRead(base::Value* value_owned,
                                PersistentPrefStore::PrefReadError error,
                                bool no_dir) {
-  scoped_ptr<Value> value(value_owned);
+  scoped_ptr<base::Value> value(value_owned);
   read_error_ = error;
 
   if (no_dir) {
     FOR_EACH_OBSERVER(PrefStore::Observer,
                       observers_,
                       OnInitializationCompleted(false));
     return;
   }
 
   initialized_ = true;
 
   switch (error) {
     case PREF_READ_ERROR_ACCESS_DENIED:
     case PREF_READ_ERROR_FILE_OTHER:
     case PREF_READ_ERROR_FILE_LOCKED:
     case PREF_READ_ERROR_JSON_TYPE:
     case PREF_READ_ERROR_FILE_NOT_SPECIFIED:
       read_only_ = true;
       break;
     case PREF_READ_ERROR_NONE:
       DCHECK(value.get());
-      prefs_.reset(static_cast<DictionaryValue*>(value.release()));
+      prefs_.reset(static_cast<base::DictionaryValue*>(value.release()));
       break;
     case PREF_READ_ERROR_NO_FILE:
       // If the file just doesn't exist, maybe this is first run.  In any case
       // there's no harm in writing out default prefs in this case.
       break;
     case PREF_READ_ERROR_JSON_PARSE:
     case PREF_READ_ERROR_JSON_REPEAT:
       break;
     default:
       NOTREACHED() << "Unknown error: " << error;
   }
 
   if (error_delegate_.get() && error != PREF_READ_ERROR_NONE)
     error_delegate_->OnError(error);
 
   FOR_EACH_OBSERVER(PrefStore::Observer,
                     observers_,
                     OnInitializationCompleted(true));
 }
 
 JsonPrefStore::~JsonPrefStore() {
   CommitPendingWrite();
 }
 
 bool JsonPrefStore::SerializeData(std::string* output) {
   // TODO(tc): Do we want to prune webkit preferences that match the default
   // value?
   JSONStringValueSerializer serializer(output);
   serializer.set_pretty_print(true);
-  scoped_ptr<DictionaryValue> copy(prefs_->DeepCopyWithoutEmptyChildren());
+  scoped_ptr<base::DictionaryValue> copy(
+      prefs_->DeepCopyWithoutEmptyChildren());
 
   // Iterates |keys_need_empty_value_| and if the key exists in |prefs_|,
   // ensure its empty ListValue or DictonaryValue is preserved.
   for (std::set<std::string>::const_iterator
        it = keys_need_empty_value_.begin();
        it != keys_need_empty_value_.end();
        ++it) {
     const std::string& key = *it;
 
     base::Value* value = NULL;
     if (!prefs_->Get(key, &value))
       continue;
 
     if (value->IsType(base::Value::TYPE_LIST)) {
       const base::ListValue* list = NULL;
       if (value->GetAsList(&list) && list->empty())
         copy->Set(key, new base::ListValue);
     } else if (value->IsType(base::Value::TYPE_DICTIONARY)) {
       const base::DictionaryValue* dict = NULL;
       if (value->GetAsDictionary(&dict) && dict->empty())
         copy->Set(key, new base::DictionaryValue);
     }
   }
 
   return serializer.Serialize(*(copy.get()));
 }