Update some uses of Value in chrome/browser to use the base:: namespace.

BUG=88666
TEST=no change
TBR=ben@chromium.org

Review URL: https://codereview.chromium.org/113013003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242399 0039d316-1c4b-4281-b951-d872f2087c98

103 files changed, 684 insertions, 623 deletions

diff --git a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc
index ef4037d..3c4a8c8 100644
--- a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc
+++ b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc
@@ -144,7 +144,7 @@ void CloudPrintProxyService::GetPrintersAvalibleForRegistration(
   if (!list_path.empty()) {
     std::string printers_json;
     base::ReadFileToString(list_path, &printers_json);
-    scoped_ptr<Value> value(base::JSONReader::Read(printers_json));
+    scoped_ptr<base::Value> value(base::JSONReader::Read(printers_json));
     base::ListValue* list = NULL;
     if (value && value->GetAsList(&list) && list) {
       for (size_t i = 0; i < list->GetSize(); ++i) {
diff --git a/chrome/browser/printing/cloud_print/cloud_print_proxy_service_unittest.cc b/chrome/browser/printing/cloud_print/cloud_print_proxy_service_unittest.cc
index ebb5110..5de0e38 100644
--- a/chrome/browser/printing/cloud_print/cloud_print_proxy_service_unittest.cc
+++ b/chrome/browser/printing/cloud_print/cloud_print_proxy_service_unittest.cc
@@ -242,7 +242,7 @@ TEST_F(CloudPrintProxyPolicyTest, StartWithNoPolicyProxyDisabled) {
 
   TestingPrefServiceSyncable* prefs = profile_.GetTestingPrefService();
   prefs->SetUserPref(prefs::kCloudPrintEmail,
-                     Value::CreateStringValue(
+                     base::Value::CreateStringValue(
                          MockServiceProcessControl::EnabledUserId()));
 
   service.Initialize();
@@ -258,7 +258,7 @@ TEST_F(CloudPrintProxyPolicyTest, StartWithNoPolicyProxyEnabled) {
 
   TestingPrefServiceSyncable* prefs = profile_.GetTestingPrefService();
   prefs->SetUserPref(prefs::kCloudPrintEmail,
-                     Value::CreateStringValue(std::string()));
+                     base::Value::CreateStringValue(std::string()));
 
   service.Initialize();
   service.RefreshStatusFromService();
@@ -275,9 +275,9 @@ TEST_F(CloudPrintProxyPolicyTest, StartWithPolicySetProxyDisabled) {
 
   TestingPrefServiceSyncable* prefs = profile_.GetTestingPrefService();
   prefs->SetUserPref(prefs::kCloudPrintEmail,
-                     Value::CreateStringValue(std::string()));
+                     base::Value::CreateStringValue(std::string()));
   prefs->SetManagedPref(prefs::kCloudPrintProxyEnabled,
-                        Value::CreateBooleanValue(false));
+                        base::Value::CreateBooleanValue(false));
 
   service.Initialize();
 
@@ -293,9 +293,9 @@ TEST_F(CloudPrintProxyPolicyTest, StartWithPolicySetProxyEnabled) {
 
   TestingPrefServiceSyncable* prefs = profile_.GetTestingPrefService();
   prefs->SetUserPref(prefs::kCloudPrintEmail,
-                     Value::CreateStringValue(std::string()));
+                     base::Value::CreateStringValue(std::string()));
   prefs->SetManagedPref(prefs::kCloudPrintProxyEnabled,
-                        Value::CreateBooleanValue(false));
+                        base::Value::CreateBooleanValue(false));
 
   service.Initialize();
 
@@ -310,7 +310,7 @@ TEST_F(CloudPrintProxyPolicyTest, StartWithNoPolicyProxyDisabledThenSetPolicy) {
 
   TestingPrefServiceSyncable* prefs = profile_.GetTestingPrefService();
   prefs->SetUserPref(prefs::kCloudPrintEmail,
-                     Value::CreateStringValue(
+                     base::Value::CreateStringValue(
                          MockServiceProcessControl::EnabledUserId()));
 
   service.Initialize();
@@ -318,7 +318,7 @@ TEST_F(CloudPrintProxyPolicyTest, StartWithNoPolicyProxyDisabledThenSetPolicy) {
   EXPECT_EQ(std::string(), prefs->GetString(prefs::kCloudPrintEmail));
 
   prefs->SetManagedPref(prefs::kCloudPrintProxyEnabled,
-                        Value::CreateBooleanValue(false));
+                        base::Value::CreateBooleanValue(false));
 
   EXPECT_EQ(std::string(), prefs->GetString(prefs::kCloudPrintEmail));
 }
@@ -331,7 +331,7 @@ TEST_F(CloudPrintProxyPolicyTest, StartWithNoPolicyProxyEnabledThenSetPolicy) {
 
   TestingPrefServiceSyncable* prefs = profile_.GetTestingPrefService();
   prefs->SetUserPref(prefs::kCloudPrintEmail,
-                     Value::CreateStringValue(std::string()));
+                     base::Value::CreateStringValue(std::string()));
 
   service.Initialize();
   service.RefreshStatusFromService();
@@ -341,7 +341,7 @@ TEST_F(CloudPrintProxyPolicyTest, StartWithNoPolicyProxyEnabledThenSetPolicy) {
 
   service.GetMockServiceProcessControl()->SetWillBeDisabledExpectations();
   prefs->SetManagedPref(prefs::kCloudPrintProxyEnabled,
-                        Value::CreateBooleanValue(false));
+                        base::Value::CreateBooleanValue(false));
 
   EXPECT_EQ(std::string(), prefs->GetString(prefs::kCloudPrintEmail));
 }
@@ -355,9 +355,9 @@ TEST_F(CloudPrintProxyPolicyTest,
 
   TestingPrefServiceSyncable* prefs = profile_.GetTestingPrefService();
   prefs->SetUserPref(prefs::kCloudPrintEmail,
-                     Value::CreateStringValue(std::string()));
+                     base::Value::CreateStringValue(std::string()));
   prefs->SetManagedPref(prefs::kCloudPrintProxyEnabled,
-                        Value::CreateBooleanValue(false));
+                        base::Value::CreateBooleanValue(false));
 
   service.Initialize();
 
@@ -376,9 +376,9 @@ TEST_F(CloudPrintProxyPolicyTest,
 
   TestingPrefServiceSyncable* prefs = profile_.GetTestingPrefService();
   prefs->SetUserPref(prefs::kCloudPrintEmail,
-                     Value::CreateStringValue(std::string()));
+                     base::Value::CreateStringValue(std::string()));
   prefs->SetManagedPref(prefs::kCloudPrintProxyEnabled,
-                        Value::CreateBooleanValue(false));
+                        base::Value::CreateBooleanValue(false));
 
   service.Initialize();
 
@@ -395,7 +395,7 @@ TEST_F(CloudPrintProxyPolicyTest, StartWithNoPolicyProxyDisabledThenEnable) {
 
   TestingPrefServiceSyncable* prefs = profile_.GetTestingPrefService();
   prefs->SetUserPref(prefs::kCloudPrintEmail,
-                     Value::CreateStringValue(
+                     base::Value::CreateStringValue(
                          MockServiceProcessControl::EnabledUserId()));
 
   service.Initialize();
@@ -418,9 +418,9 @@ TEST_F(CloudPrintProxyPolicyTest,
 
   TestingPrefServiceSyncable* prefs = profile_.GetTestingPrefService();
   prefs->SetUserPref(prefs::kCloudPrintEmail,
-                     Value::CreateStringValue(std::string()));
+                     base::Value::CreateStringValue(std::string()));
   prefs->SetManagedPref(prefs::kCloudPrintProxyEnabled,
-                        Value::CreateBooleanValue(false));
+                        base::Value::CreateBooleanValue(false));
 
   service.Initialize();
 
@@ -454,9 +454,9 @@ BrowserContextKeyedService* TestCloudPrintProxyServiceFactory(
 TEST_F(CloudPrintProxyPolicyTest, StartupBrowserCreatorWithCommandLine) {
   TestingPrefServiceSyncable* prefs = profile_.GetTestingPrefService();
   prefs->SetUserPref(prefs::kCloudPrintEmail,
-                     Value::CreateStringValue(std::string()));
+                     base::Value::CreateStringValue(std::string()));
   prefs->SetManagedPref(prefs::kCloudPrintProxyEnabled,
-                        Value::CreateBooleanValue(false));
+                        base::Value::CreateBooleanValue(false));
 
   CloudPrintProxyServiceFactory::GetInstance()->
       SetTestingFactory(&profile_, TestCloudPrintProxyServiceFactory);
diff --git a/chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc b/chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc
index ac540ad..e5c8987 100644
--- a/chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc
+++ b/chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc
@@ -532,7 +532,7 @@ TEST_F(CloudPrintProxyPolicyStartupTest, StartBrowserWithoutPolicy) {
 
   TestingPrefServiceSyncable* prefs = profile->GetTestingPrefService();
   prefs->SetUserPref(prefs::kCloudPrintEmail,
-                     Value::CreateStringValue(
+                     base::Value::CreateStringValue(
                          MockServiceIPCServer::EnabledUserId()));
 
   CommandLine command_line(CommandLine::NO_PROGRAM);
@@ -580,10 +580,10 @@ TEST_F(CloudPrintProxyPolicyStartupTest, StartBrowserWithPolicy) {
 
   TestingPrefServiceSyncable* prefs = profile->GetTestingPrefService();
   prefs->SetUserPref(prefs::kCloudPrintEmail,
-                     Value::CreateStringValue(
+                     base::Value::CreateStringValue(
                          MockServiceIPCServer::EnabledUserId()));
   prefs->SetManagedPref(prefs::kCloudPrintProxyEnabled,
-                        Value::CreateBooleanValue(false));
+                        base::Value::CreateBooleanValue(false));
 
   CommandLine command_line(CommandLine::NO_PROGRAM);
   command_line.AppendSwitch(switches::kCheckCloudPrintConnectorPolicy);
diff --git a/chrome/browser/printing/print_dialog_cloud.cc b/chrome/browser/printing/print_dialog_cloud.cc
index 3a739f3..63041e5 100644
--- a/chrome/browser/printing/print_dialog_cloud.cc
+++ b/chrome/browser/printing/print_dialog_cloud.cc
@@ -121,15 +121,18 @@ namespace internal_cloud_print_helpers {
 // parameters.
 bool GetPageSetupParameters(const std::string& json,
                             PrintMsg_Print_Params& parameters) {
-  scoped_ptr<Value> parsed_value(base::JSONReader::Read(json));
+  scoped_ptr<base::Value> parsed_value(base::JSONReader::Read(json));
   DLOG_IF(ERROR, (!parsed_value.get() ||
-                  !parsed_value->IsType(Value::TYPE_DICTIONARY)))
+                  !parsed_value->IsType(base::Value::TYPE_DICTIONARY)))
       << "PageSetup call didn't have expected contents";
-  if (!parsed_value.get() || !parsed_value->IsType(Value::TYPE_DICTIONARY))
+  if (!parsed_value.get() ||
+      !parsed_value->IsType(base::Value::TYPE_DICTIONARY)) {
     return false;
+  }
 
   bool result = true;
-  DictionaryValue* params = static_cast<DictionaryValue*>(parsed_value.get());
+  base::DictionaryValue* params =
+      static_cast<base::DictionaryValue*>(parsed_value.get());
   result &= params->GetDouble("dpi", &parameters.dpi);
   result &= params->GetDouble("min_shrink", &parameters.min_shrink);
   result &= params->GetDouble("max_shrink", &parameters.max_shrink);
@@ -151,7 +154,9 @@ base::string16 GetSwitchValueString16(const CommandLine& command_line,
 }
 
 void CloudPrintDataSenderHelper::CallJavascriptFunction(
-    const std::string& function_name, const Value& arg1, const Value& arg2) {
+    const std::string& function_name,
+    const base::Value& arg1,
+    const base::Value& arg2) {
   web_ui_->CallJavascriptFunction(function_name, arg1, arg2);
 }
 
@@ -334,7 +339,7 @@ void CloudPrintFlowHandler::Observe(
   }
 }
 
-void CloudPrintFlowHandler::HandleShowDebugger(const ListValue* args) {
+void CloudPrintFlowHandler::HandleShowDebugger(const base::ListValue* args) {
   ShowDebugger();
 }
 
@@ -359,7 +364,7 @@ CloudPrintFlowHandler::CreateCloudPrintDataSender() {
   return sender;
 }
 
-void CloudPrintFlowHandler::HandleSendPrintData(const ListValue* args) {
+void CloudPrintFlowHandler::HandleSendPrintData(const base::ListValue* args) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   // This will cancel any ReadPrintDataFile() or SendPrintDataFile()
   // requests in flight (this is anticipation of when setting page
@@ -374,7 +379,8 @@ void CloudPrintFlowHandler::HandleSendPrintData(const ListValue* args) {
   }
 }
 
-void CloudPrintFlowHandler::HandleSetPageParameters(const ListValue* args) {
+void CloudPrintFlowHandler::HandleSetPageParameters(
+    const base::ListValue* args) {
   std::string json;
   bool ret = args->GetString(0, &json);
   if (!ret || json.empty()) {
diff --git a/chrome/browser/printing/print_dialog_cloud_unittest.cc b/chrome/browser/printing/print_dialog_cloud_unittest.cc
index 7a604aa..c466b3e 100644
--- a/chrome/browser/printing/print_dialog_cloud_unittest.cc
+++ b/chrome/browser/printing/print_dialog_cloud_unittest.cc
@@ -137,8 +137,8 @@ class MockCloudPrintDataSenderHelper : public CloudPrintDataSenderHelper {
   // of expects/results.
   MockCloudPrintDataSenderHelper() : CloudPrintDataSenderHelper(NULL) {}
   MOCK_METHOD3(CallJavascriptFunction, void(const std::string&,
-                                            const Value& arg1,
-                                            const Value& arg2));
+                                            const base::Value& arg1,
+                                            const base::Value& arg2));
 };
 
 class CloudPrintURLTest : public testing::Test {
@@ -235,7 +235,7 @@ class CloudPrintDataSenderTest : public testing::Test {
 };
 
 TEST_F(CloudPrintDataSenderTest, CanSend) {
-  StringValue mock_job_title(kMockJobTitle);
+  base::StringValue mock_job_title(kMockJobTitle);
   EXPECT_CALL(*mock_helper_,
               CallJavascriptFunction(_, _, StringValueEq(&mock_job_title))).
       WillOnce(Return());
diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc
index b60e001..f034e79 100644
--- a/chrome/browser/printing/print_job_worker.cc
+++ b/chrome/browser/printing/print_job_worker.cc
@@ -115,7 +115,8 @@ void PrintJobWorker::GetSettings(
   }
 }
 
-void PrintJobWorker::SetSettings(const DictionaryValue* const new_settings) {
+void PrintJobWorker::SetSettings(
+    const base::DictionaryValue* const new_settings) {
   DCHECK_EQ(message_loop(), base::MessageLoop::current());
 
   BrowserThread::PostTask(
@@ -126,13 +127,13 @@ void PrintJobWorker::SetSettings(const DictionaryValue* const new_settings) {
 }
 
 void PrintJobWorker::UpdatePrintSettings(
-    const DictionaryValue* const new_settings) {
+    const base::DictionaryValue* const new_settings) {
   // Create new PageRanges based on |new_settings|.
   PageRanges new_ranges;
-  const ListValue* page_range_array;
+  const base::ListValue* page_range_array;
   if (new_settings->GetList(kSettingPageRange, &page_range_array)) {
     for (size_t index = 0; index < page_range_array->GetSize(); ++index) {
-      const DictionaryValue* dict;
+      const base::DictionaryValue* dict;
       if (!page_range_array->GetDictionary(index, &dict))
         continue;
 
diff --git a/chrome/browser/printing/printer_query.cc b/chrome/browser/printing/printer_query.cc
index cad1459..d05900e 100644
--- a/chrome/browser/printing/printer_query.cc
+++ b/chrome/browser/printing/printer_query.cc
@@ -94,7 +94,7 @@ void PrinterQuery::GetSettings(
                  margin_type));
 }
 
-void PrinterQuery::SetSettings(const DictionaryValue& new_settings,
+void PrinterQuery::SetSettings(const base::DictionaryValue& new_settings,
                                const base::Closure& callback) {
   StartWorker(callback);
 
diff --git a/chrome/browser/printing/printing_message_filter.cc b/chrome/browser/printing/printing_message_filter.cc
index 22fd469..0ddeb48 100644
--- a/chrome/browser/printing/printing_message_filter.cc
+++ b/chrome/browser/printing/printing_message_filter.cc
@@ -427,7 +427,7 @@ void PrintingMessageFilter::UpdateFileDescriptor(int render_view_id, int fd) {
 #endif
 
 void PrintingMessageFilter::OnUpdatePrintSettings(
-    int document_cookie, const DictionaryValue& job_settings,
+    int document_cookie, const base::DictionaryValue& job_settings,
     IPC::Message* reply_msg) {
   scoped_refptr<printing::PrinterQuery> printer_query;
   if (!profile_io_data_->printing_enabled()->GetValue()) {
diff --git a/chrome/browser/profile_resetter/automatic_profile_resetter.cc b/chrome/browser/profile_resetter/automatic_profile_resetter.cc
index 48bddd6..4af4cd63 100644
--- a/chrome/browser/profile_resetter/automatic_profile_resetter.cc
+++ b/chrome/browser/profile_resetter/automatic_profile_resetter.cc
@@ -139,7 +139,7 @@ void BuildSubTreesFromPreferences(
   base::DictionaryValue* is_user_controlled_tree = new base::DictionaryValue;
   for (std::vector<std::string>::const_iterator it = pref_names.begin();
        it != pref_names.end(); ++it) {
-    scoped_ptr<Value> pref_value_owned;
+    scoped_ptr<base::Value> pref_value_owned;
     if (pref_name_to_value_map->RemoveWithoutPathExpansion(*it,
                                                            &pref_value_owned)) {
       value_tree->Set(*it, pref_value_owned.release());
diff --git a/chrome/browser/profile_resetter/automatic_profile_resetter_mementos.cc b/chrome/browser/profile_resetter/automatic_profile_resetter_mementos.cc
index af7fa4d..6bb94e2 100644
--- a/chrome/browser/profile_resetter/automatic_profile_resetter_mementos.cc
+++ b/chrome/browser/profile_resetter/automatic_profile_resetter_mementos.cc
@@ -52,7 +52,7 @@ std::string LocalStateHostedPromptMemento::ReadValue() const {
   PrefService* local_state = g_browser_process->local_state();
   DCHECK(local_state);
 
-  const DictionaryValue* prompt_shown_dict =
+  const base::DictionaryValue* prompt_shown_dict =
       local_state->GetDictionary(prefs::kProfileResetPromptMemento);
   std::string profile_key = GetProfileKey();
   if (!prompt_shown_dict || profile_key.empty()) {
diff --git a/chrome/browser/profile_resetter/brandcoded_default_settings.cc b/chrome/browser/profile_resetter/brandcoded_default_settings.cc
index 8b32afa..922073a 100644
--- a/chrome/browser/profile_resetter/brandcoded_default_settings.cc
+++ b/chrome/browser/profile_resetter/brandcoded_default_settings.cc
@@ -35,8 +35,8 @@ BrandcodedDefaultSettings::BrandcodedDefaultSettings(const std::string& prefs) {
 BrandcodedDefaultSettings::~BrandcodedDefaultSettings() {
 }
 
-scoped_ptr<ListValue> BrandcodedDefaultSettings::GetSearchProviderOverrides(
-    ) const {
+scoped_ptr<base::ListValue>
+BrandcodedDefaultSettings::GetSearchProviderOverrides() const {
   return ExtractList(prefs::kSearchProviderOverrides);
 }
 
@@ -68,7 +68,7 @@ bool BrandcodedDefaultSettings::GetExtensions(
       master_dictionary_->GetDictionary(
           installer::master_preferences::kExtensionsBlock,
           &extensions)) {
-    for (DictionaryValue::Iterator extension_id(*extensions);
+    for (base::DictionaryValue::Iterator extension_id(*extensions);
          !extension_id.IsAtEnd(); extension_id.Advance()) {
       if (extensions::Extension::IdIsValid(extension_id.key()))
         extension_ids->push_back(extension_id.key());
@@ -85,18 +85,18 @@ bool BrandcodedDefaultSettings::GetRestoreOnStartup(
                                         restore_on_startup);
 }
 
-scoped_ptr<ListValue> BrandcodedDefaultSettings::GetUrlsToRestoreOnStartup(
-    ) const {
+scoped_ptr<base::ListValue>
+BrandcodedDefaultSettings::GetUrlsToRestoreOnStartup() const {
   return ExtractList(prefs::kURLsToRestoreOnStartup);
 }
 
-scoped_ptr<ListValue> BrandcodedDefaultSettings::ExtractList(
+scoped_ptr<base::ListValue> BrandcodedDefaultSettings::ExtractList(
     const char* pref_name) const {
   const base::ListValue* value = NULL;
   if (master_dictionary_ &&
       master_dictionary_->GetList(pref_name, &value) &&
       !value->empty()) {
-    return scoped_ptr<ListValue>(value->DeepCopy());
+    return scoped_ptr<base::ListValue>(value->DeepCopy());
   }
-  return scoped_ptr<ListValue>();
+  return scoped_ptr<base::ListValue>();
 }
diff --git a/chrome/browser/profile_resetter/brandcoded_default_settings.h b/chrome/browser/profile_resetter/brandcoded_default_settings.h
index bdd7adf..2de4041 100644
--- a/chrome/browser/profile_resetter/brandcoded_default_settings.h
+++ b/chrome/browser/profile_resetter/brandcoded_default_settings.h
@@ -25,7 +25,7 @@ class BrandcodedDefaultSettings {
   // provided for given setting.
   // After the call return_value contains a list of default engines.
   // |return_value[0]| is default one.
-  scoped_ptr<ListValue> GetSearchProviderOverrides() const;
+  scoped_ptr<base::ListValue> GetSearchProviderOverrides() const;
 
   bool GetHomepage(std::string* homepage) const;
   bool GetHomepageIsNewTab(bool* homepage_is_ntp) const;
@@ -35,10 +35,10 @@ class BrandcodedDefaultSettings {
   bool GetExtensions(std::vector<std::string>* extension_ids) const;
 
   bool GetRestoreOnStartup(int* restore_on_startup) const;
-  scoped_ptr<ListValue> GetUrlsToRestoreOnStartup() const;
+  scoped_ptr<base::ListValue> GetUrlsToRestoreOnStartup() const;
 
  private:
-  scoped_ptr<ListValue> ExtractList(const char* pref_name) const;
+  scoped_ptr<base::ListValue> ExtractList(const char* pref_name) const;
 
   scoped_ptr<base::DictionaryValue> master_dictionary_;
 
diff --git a/chrome/browser/profile_resetter/jtl_interpreter.cc b/chrome/browser/profile_resetter/jtl_interpreter.cc
index ea3391f..7460cee 100644
--- a/chrome/browser/profile_resetter/jtl_interpreter.cc
+++ b/chrome/browser/profile_resetter/jtl_interpreter.cc
@@ -36,8 +36,8 @@ class ExecutionContext {
   // sentence is evaluated on.
   ExecutionContext(const jtl_foundation::Hasher* hasher,
                    const std::vector<Operation*>& sentence,
-                   const DictionaryValue* input,
-                   DictionaryValue* working_memory)
+                   const base::DictionaryValue* input,
+                   base::DictionaryValue* working_memory)
       : hasher_(hasher),
         sentence_(sentence),
         next_instruction_index_(0u),
@@ -69,7 +69,7 @@ class ExecutionContext {
 
   // Calculates the |hash| of a string, integer or double |value|, and returns
   // true. Returns false otherwise.
-  bool GetValueHash(const Value& value, std::string* hash) {
+  bool GetValueHash(const base::Value& value, std::string* hash) {
     DCHECK(hash);
     std::string value_as_string;
     int tmp_int = 0;
@@ -84,9 +84,9 @@ class ExecutionContext {
     return true;
   }
 
-  const Value* current_node() const { return stack_.back(); }
-  std::vector<const Value*>* stack() { return &stack_; }
-  DictionaryValue* working_memory() { return working_memory_; }
+  const base::Value* current_node() const { return stack_.back(); }
+  std::vector<const base::Value*>* stack() { return &stack_; }
+  base::DictionaryValue* working_memory() { return working_memory_; }
   bool error() const { return error_; }
 
  private:
@@ -99,9 +99,9 @@ class ExecutionContext {
   // A stack of Values, indicating a navigation path from the root node of
   // |input| (see constructor) to the current node on which the
   // sentence_[next_instruction_index_] is evaluated.
-  std::vector<const Value*> stack_;
+  std::vector<const base::Value*> stack_;
   // Memory into which values can be stored by the program.
-  DictionaryValue* working_memory_;
+  base::DictionaryValue* working_memory_;
   // Whether a runtime error occurred.
   bool error_;
   DISALLOW_COPY_AND_ASSIGN(ExecutionContext);
@@ -113,7 +113,7 @@ class NavigateOperation : public Operation {
       : hashed_key_(hashed_key) {}
   virtual ~NavigateOperation() {}
   virtual bool Execute(ExecutionContext* context) OVERRIDE {
-    const DictionaryValue* dict = NULL;
+    const base::DictionaryValue* dict = NULL;
     if (!context->current_node()->GetAsDictionary(&dict)) {
       // Just ignore this node gracefully as this navigation is a dead end.
       // If this NavigateOperation occurred after a NavigateAny operation, those
@@ -121,7 +121,7 @@ class NavigateOperation : public Operation {
       // sentence on other nodes.
       return true;
     }
-    for (DictionaryValue::Iterator i(*dict); !i.IsAtEnd(); i.Advance()) {
+    for (base::DictionaryValue::Iterator i(*dict); !i.IsAtEnd(); i.Advance()) {
       if (context->GetHash(i.key()) != hashed_key_)
         continue;
       context->stack()->push_back(&i.value());
@@ -143,10 +143,11 @@ class NavigateAnyOperation : public Operation {
   NavigateAnyOperation() {}
   virtual ~NavigateAnyOperation() {}
   virtual bool Execute(ExecutionContext* context) OVERRIDE {
-    const DictionaryValue* dict = NULL;
-    const ListValue* list = NULL;
+    const base::DictionaryValue* dict = NULL;
+    const base::ListValue* list = NULL;
     if (context->current_node()->GetAsDictionary(&dict)) {
-      for (DictionaryValue::Iterator i(*dict); !i.IsAtEnd(); i.Advance()) {
+      for (base::DictionaryValue::Iterator i(*dict);
+           !i.IsAtEnd(); i.Advance()) {
         context->stack()->push_back(&i.value());
         bool continue_traversal = context->ContinueExecution();
         context->stack()->pop_back();
@@ -154,7 +155,8 @@ class NavigateAnyOperation : public Operation {
           return false;
       }
     } else if (context->current_node()->GetAsList(&list)) {
-      for (ListValue::const_iterator i = list->begin(); i != list->end(); ++i) {
+      for (base::ListValue::const_iterator i = list->begin();
+           i != list->end(); ++i) {
         context->stack()->push_back(*i);
         bool continue_traversal = context->ContinueExecution();
         context->stack()->pop_back();
@@ -176,7 +178,7 @@ class NavigateBackOperation : public Operation {
   NavigateBackOperation() {}
   virtual ~NavigateBackOperation() {}
   virtual bool Execute(ExecutionContext* context) OVERRIDE {
-    const Value* current_node = context->current_node();
+    const base::Value* current_node = context->current_node();
     context->stack()->pop_back();
     bool continue_traversal = context->ContinueExecution();
     context->stack()->push_back(current_node);
@@ -189,7 +191,7 @@ class NavigateBackOperation : public Operation {
 
 class StoreValue : public Operation {
  public:
-  StoreValue(const std::string& hashed_name, scoped_ptr<Value> value)
+  StoreValue(const std::string& hashed_name, scoped_ptr<base::Value> value)
       : hashed_name_(hashed_name),
         value_(value.Pass()) {
     DCHECK(IsStringUTF8(hashed_name));
@@ -203,15 +205,15 @@ class StoreValue : public Operation {
 
  private:
   std::string hashed_name_;
-  scoped_ptr<Value> value_;
+  scoped_ptr<base::Value> value_;
   DISALLOW_COPY_AND_ASSIGN(StoreValue);
 };
 
 class CompareStoredValue : public Operation {
  public:
   CompareStoredValue(const std::string& hashed_name,
-                     scoped_ptr<Value> value,
-                     scoped_ptr<Value> default_value)
+                     scoped_ptr<base::Value> value,
+                     scoped_ptr<base::Value> default_value)
       : hashed_name_(hashed_name),
         value_(value.Pass()),
         default_value_(default_value.Pass()) {
@@ -221,7 +223,7 @@ class CompareStoredValue : public Operation {
   }
   virtual ~CompareStoredValue() {}
   virtual bool Execute(ExecutionContext* context) OVERRIDE {
-    const Value* actual_value = NULL;
+    const base::Value* actual_value = NULL;
     if (!context->working_memory()->Get(hashed_name_, &actual_value))
       actual_value = default_value_.get();
     if (!value_->Equals(actual_value))
@@ -231,8 +233,8 @@ class CompareStoredValue : public Operation {
 
  private:
   std::string hashed_name_;
-  scoped_ptr<Value> value_;
-  scoped_ptr<Value> default_value_;
+  scoped_ptr<base::Value> value_;
+  scoped_ptr<base::Value> default_value_;
   DISALLOW_COPY_AND_ASSIGN(CompareStoredValue);
 };
 
@@ -281,7 +283,7 @@ class StoreNodeEffectiveSLD : public Operation {
         !GetEffectiveSLD(possibly_invalid_url, &effective_sld))
       return true;
     context->working_memory()->Set(
-        hashed_name_, new StringValue(context->GetHash(effective_sld)));
+        hashed_name_, new base::StringValue(context->GetHash(effective_sld)));
     return context->ContinueExecution();
   }
 
@@ -379,7 +381,7 @@ class CompareNodeToStored : public Operation {
       : hashed_name_(hashed_name) {}
   virtual ~CompareNodeToStored() {}
   virtual bool Execute(ExecutionContext* context) OVERRIDE {
-    const Value* stored_value = NULL;
+    const base::Value* stored_value = NULL;
     if (!context->working_memory()->Get(hashed_name_, &stored_value))
       return true;
     if (ExpectedTypeIsBooleanNotHashable) {
@@ -490,7 +492,7 @@ class Parser {
             return false;
           operators.push_back(new StoreValue(
               hashed_name,
-              scoped_ptr<Value>(new base::FundamentalValue(value))));
+              scoped_ptr<base::Value>(new base::FundamentalValue(value))));
           break;
         }
         case jtl_foundation::COMPARE_STORED_BOOL: {
@@ -505,8 +507,9 @@ class Parser {
             return false;
           operators.push_back(new CompareStoredValue(
               hashed_name,
-              scoped_ptr<Value>(new base::FundamentalValue(value)),
-              scoped_ptr<Value>(new base::FundamentalValue(default_value))));
+              scoped_ptr<base::Value>(new base::FundamentalValue(value)),
+              scoped_ptr<base::Value>(
+                  new base::FundamentalValue(default_value))));
           break;
         }
         case jtl_foundation::STORE_HASH: {
@@ -518,7 +521,7 @@ class Parser {
             return false;
           operators.push_back(new StoreValue(
               hashed_name,
-              scoped_ptr<Value>(new base::StringValue(hashed_value))));
+              scoped_ptr<base::Value>(new base::StringValue(hashed_value))));
           break;
         }
         case jtl_foundation::COMPARE_STORED_HASH: {
@@ -533,8 +536,9 @@ class Parser {
             return false;
           operators.push_back(new CompareStoredValue(
               hashed_name,
-              scoped_ptr<Value>(new base::StringValue(hashed_value)),
-              scoped_ptr<Value>(new base::StringValue(hashed_default_value))));
+              scoped_ptr<base::Value>(new base::StringValue(hashed_value)),
+              scoped_ptr<base::Value>(
+                  new base::StringValue(hashed_default_value))));
           break;
         }
         case jtl_foundation::STORE_NODE_BOOL: {
@@ -688,13 +692,13 @@ class Parser {
 JtlInterpreter::JtlInterpreter(
     const std::string& hasher_seed,
     const std::string& program,
-    const DictionaryValue* input)
+    const base::DictionaryValue* input)
     : hasher_seed_(hasher_seed),
       program_(program),
       input_(input),
-      working_memory_(new DictionaryValue),
+      working_memory_(new base::DictionaryValue),
       result_(OK) {
-  DCHECK(input->IsType(Value::TYPE_DICTIONARY));
+  DCHECK(input->IsType(base::Value::TYPE_DICTIONARY));
 }
 
 JtlInterpreter::~JtlInterpreter() {}
diff --git a/chrome/browser/profile_resetter/jtl_interpreter.h b/chrome/browser/profile_resetter/jtl_interpreter.h
index c39c416..a87be69 100644
--- a/chrome/browser/profile_resetter/jtl_interpreter.h
+++ b/chrome/browser/profile_resetter/jtl_interpreter.h
@@ -29,13 +29,13 @@ class JtlInterpreter {
   // |input| is a dictionary on which the program is evaluated.
   JtlInterpreter(const std::string& hasher_seed,
                  const std::string& program,
-                 const DictionaryValue* input);
+                 const base::DictionaryValue* input);
   ~JtlInterpreter();
 
   void Execute();
 
   Result result() const { return result_; }
-  const DictionaryValue* working_memory() const {
+  const base::DictionaryValue* working_memory() const {
     return working_memory_.get();
   }
   bool GetOutputBoolean(const std::string& unhashed_key, bool* output) const;
@@ -46,9 +46,9 @@ class JtlInterpreter {
   // Input.
   std::string hasher_seed_;
   std::string program_;
-  const DictionaryValue* input_;
+  const base::DictionaryValue* input_;
   // Output.
-  scoped_ptr<DictionaryValue> working_memory_;
+  scoped_ptr<base::DictionaryValue> working_memory_;
   Result result_;
 
   DISALLOW_COPY_AND_ASSIGN(JtlInterpreter);
diff --git a/chrome/browser/profile_resetter/jtl_interpreter_unittest.cc b/chrome/browser/profile_resetter/jtl_interpreter_unittest.cc
index a5c0003..cb4b461 100644
--- a/chrome/browser/profile_resetter/jtl_interpreter_unittest.cc
+++ b/chrome/browser/profile_resetter/jtl_interpreter_unittest.cc
@@ -47,11 +47,11 @@ std::string EncodeUint32(uint32 value) {
     const char* escaped_json = escaped_json_param; \
     std::string json; \
     base::ReplaceChars(escaped_json, "'", "\"", &json); \
-    scoped_ptr<Value> json_value(ParseJson(json)); \
+    scoped_ptr<base::Value> json_value(ParseJson(json)); \
     JtlInterpreter interpreter( \
         seed, \
         program_param, \
-        static_cast<const DictionaryValue*>(json_value.get())); \
+        static_cast<const base::DictionaryValue*>(json_value.get())); \
     interpreter.Execute()
 
 using base::test::ParseJson;
diff --git a/chrome/browser/profile_resetter/profile_resetter.cc b/chrome/browser/profile_resetter/profile_resetter.cc
index be010b4..a0fc142 100644
--- a/chrome/browser/profile_resetter/profile_resetter.cc
+++ b/chrome/browser/profile_resetter/profile_resetter.cc
@@ -117,7 +117,7 @@ void ProfileResetter::ResetDefaultSearchEngine() {
     PrefService* prefs = profile_->GetPrefs();
     DCHECK(prefs);
     TemplateURLPrepopulateData::ClearPrepopulatedEnginesInPrefs(profile_);
-    scoped_ptr<ListValue> search_engines(
+    scoped_ptr<base::ListValue> search_engines(
         master_settings_->GetSearchProviderOverrides());
     if (search_engines) {
       // This Chrome distribution channel provides a custom search engine. We
@@ -218,7 +218,8 @@ void ProfileResetter::ResetStartupPages() {
   DCHECK(CalledOnValidThread());
   PrefService* prefs = profile_->GetPrefs();
   DCHECK(prefs);
-  scoped_ptr<ListValue> url_list(master_settings_->GetUrlsToRestoreOnStartup());
+  scoped_ptr<base::ListValue> url_list(
+      master_settings_->GetUrlsToRestoreOnStartup());
   if (url_list)
     ListPrefUpdate(prefs, prefs::kURLsToRestoreOnStartup)->Swap(url_list.get());
 
diff --git a/chrome/browser/profile_resetter/profile_resetter_unittest.cc b/chrome/browser/profile_resetter/profile_resetter_unittest.cc
index acf44dc..3039039 100644
--- a/chrome/browser/profile_resetter/profile_resetter_unittest.cc
+++ b/chrome/browser/profile_resetter/profile_resetter_unittest.cc
@@ -237,12 +237,13 @@ scoped_refptr<Extension> CreateExtension(const base::string16& name,
                                          Manifest::Location location,
                                          extensions::Manifest::Type type,
                                          bool installed_by_default) {
-  DictionaryValue manifest;
+  base::DictionaryValue manifest;
   manifest.SetString(extensions::manifest_keys::kVersion, "1.0.0.0");
   manifest.SetString(extensions::manifest_keys::kName, name);
   switch (type) {
     case extensions::Manifest::TYPE_THEME:
-      manifest.Set(extensions::manifest_keys::kTheme, new DictionaryValue);
+      manifest.Set(extensions::manifest_keys::kTheme,
+                   new base::DictionaryValue);
       break;
     case extensions::Manifest::TYPE_HOSTED_APP:
       manifest.SetString(extensions::manifest_keys::kLaunchWebURL,
@@ -790,12 +791,12 @@ TEST_F(ProfileResetterTest, FeedbackSerializtionTest) {
     base::DictionaryValue* dict =
         static_cast<base::DictionaryValue*>(root.get());
 
-    ListValue* startup_urls = NULL;
+    base::ListValue* startup_urls = NULL;
     int startup_type = 0;
     std::string homepage;
     bool homepage_is_ntp = true;
     std::string default_search_engine;
-    ListValue* extensions;
+    base::ListValue* extensions;
 
     EXPECT_EQ(!!(field_mask & ResettableSettingsSnapshot::STARTUP_MODE),
               dict->GetList("startup_urls", &startup_urls));
@@ -840,7 +841,7 @@ TEST_F(ProfileResetterTest, GetReadableFeedback) {
   scoped_ptr<base::ListValue> list(GetReadableFeedback(profile()));
   ASSERT_TRUE(list);
   for (size_t i = 0; i < list->GetSize(); ++i) {
-    DictionaryValue* dict = NULL;
+    base::DictionaryValue* dict = NULL;
     ASSERT_TRUE(list->GetDictionary(i, &dict));
     std::string value;
     ASSERT_TRUE(dict->GetString("key", &value));
diff --git a/chrome/browser/profile_resetter/resettable_settings_snapshot.cc b/chrome/browser/profile_resetter/resettable_settings_snapshot.cc
index cd4eef2..741bf82 100644
--- a/chrome/browser/profile_resetter/resettable_settings_snapshot.cc
+++ b/chrome/browser/profile_resetter/resettable_settings_snapshot.cc
@@ -37,10 +37,10 @@ const char kStartupTypePath[] = "startup_type";
 const char kStartupURLPath[] = "startup_urls";
 
 template <class StringType>
-void AddPair(ListValue* list,
+void AddPair(base::ListValue* list,
              const base::string16& key,
              const StringType& value) {
-  DictionaryValue* results = new DictionaryValue();
+  base::DictionaryValue* results = new base::DictionaryValue();
   results->SetString("key", key);
   results->SetString("value", value);
   list->Append(results);
@@ -113,10 +113,10 @@ int ResettableSettingsSnapshot::FindDifferentFields(
 
 std::string SerializeSettingsReport(const ResettableSettingsSnapshot& snapshot,
                                     int field_mask) {
-  DictionaryValue dict;
+  base::DictionaryValue dict;
 
   if (field_mask & ResettableSettingsSnapshot::STARTUP_MODE) {
-    ListValue* list = new ListValue;
+    base::ListValue* list = new base::ListValue;
     const std::vector<GURL>& urls = snapshot.startup_urls();
     for (std::vector<GURL>::const_iterator i = urls.begin();
          i != urls.end(); ++i)
@@ -134,7 +134,7 @@ std::string SerializeSettingsReport(const ResettableSettingsSnapshot& snapshot,
     dict.SetString(kDefaultSearchEnginePath, snapshot.dse_url());
 
   if (field_mask & ResettableSettingsSnapshot::EXTENSIONS) {
-    ListValue* list = new ListValue;
+    base::ListValue* list = new base::ListValue;
     const ResettableSettingsSnapshot::ExtensionList& extensions =
         snapshot.enabled_extensions();
     for (ResettableSettingsSnapshot::ExtensionList::const_iterator i =
@@ -180,9 +180,9 @@ void SendSettingsFeedback(const std::string& report,
   feedback_util::SendReport(feedback_data);
 }
 
-ListValue* GetReadableFeedback(Profile* profile) {
+base::ListValue* GetReadableFeedback(Profile* profile) {
   DCHECK(profile);
-  ListValue* list = new ListValue;
+  base::ListValue* list = new base::ListValue;
   AddPair(list, l10n_util::GetStringUTF16(IDS_RESET_PROFILE_SETTINGS_LOCALE),
           g_browser_process->GetApplicationLocale());
   AddPair(list,
diff --git a/chrome/browser/profiles/off_the_record_profile_impl.cc b/chrome/browser/profiles/off_the_record_profile_impl.cc
index 6d25836..d1a0b27 100644
--- a/chrome/browser/profiles/off_the_record_profile_impl.cc
+++ b/chrome/browser/profiles/off_the_record_profile_impl.cc
@@ -188,7 +188,7 @@ void OffTheRecordProfileImpl::UseSystemProxy() {
   const char kProxyBypassList[] = "bypass_list";
   const char kProxyPacUrl[] = "pac_url";
   DictionaryPrefUpdate update(prefs_, prefs::kProxy);
-  DictionaryValue* dict = update.Get();
+  base::DictionaryValue* dict = update.Get();
   dict->SetString(kProxyMode, ProxyModeToString(ProxyPrefs::MODE_SYSTEM));
   dict->SetString(kProxyPacUrl, "");
   dict->SetString(kProxyServer, "");
diff --git a/chrome/browser/profiles/off_the_record_profile_impl_unittest.cc b/chrome/browser/profiles/off_the_record_profile_impl_unittest.cc
index d9ddb2d..a74250b 100644
--- a/chrome/browser/profiles/off_the_record_profile_impl_unittest.cc
+++ b/chrome/browser/profiles/off_the_record_profile_impl_unittest.cc
@@ -55,12 +55,12 @@ class TestingProfileWithHostZoomMap : public TestingProfile {
 
     double level = change.zoom_level;
     DictionaryPrefUpdate update(prefs_.get(), prefs::kPerHostZoomLevels);
-    DictionaryValue* host_zoom_dictionary = update.Get();
+    base::DictionaryValue* host_zoom_dictionary = update.Get();
     if (level == host_zoom_map->GetDefaultZoomLevel()) {
       host_zoom_dictionary->RemoveWithoutPathExpansion(change.host, NULL);
     } else {
       host_zoom_dictionary->SetWithoutPathExpansion(
-          change.host, Value::CreateDoubleValue(level));
+          change.host, base::Value::CreateDoubleValue(level));
     }
   }
 
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index c84558e..d8c3ce3 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -634,11 +634,11 @@ void ProfileImpl::InitHostZoomMap() {
   host_zoom_map->SetDefaultZoomLevel(
       prefs_->GetDouble(prefs::kDefaultZoomLevel));
 
-  const DictionaryValue* host_zoom_dictionary =
+  const base::DictionaryValue* host_zoom_dictionary =
       prefs_->GetDictionary(prefs::kPerHostZoomLevels);
   // Careful: The returned value could be NULL if the pref has never been set.
   if (host_zoom_dictionary != NULL) {
-    for (DictionaryValue::Iterator i(*host_zoom_dictionary); !i.IsAtEnd();
+    for (base::DictionaryValue::Iterator i(*host_zoom_dictionary); !i.IsAtEnd();
          i.Advance()) {
       const std::string& host(i.key());
       double zoom_level = 0;
@@ -1031,12 +1031,12 @@ void ProfileImpl::OnZoomLevelChanged(
   HostZoomMap* host_zoom_map = HostZoomMap::GetForBrowserContext(this);
   double level = change.zoom_level;
   DictionaryPrefUpdate update(prefs_.get(), prefs::kPerHostZoomLevels);
-  DictionaryValue* host_zoom_dictionary = update.Get();
+  base::DictionaryValue* host_zoom_dictionary = update.Get();
   if (level == host_zoom_map->GetDefaultZoomLevel()) {
     host_zoom_dictionary->RemoveWithoutPathExpansion(change.host, NULL);
   } else {
     host_zoom_dictionary->SetWithoutPathExpansion(
-        change.host, Value::CreateDoubleValue(level));
+        change.host, base::Value::CreateDoubleValue(level));
   }
 }
 
diff --git a/chrome/browser/profiles/profile_info_cache.cc b/chrome/browser/profiles/profile_info_cache.cc
index b677251..a71db61 100644
--- a/chrome/browser/profiles/profile_info_cache.cc
+++ b/chrome/browser/profiles/profile_info_cache.cc
@@ -180,9 +180,10 @@ ProfileInfoCache::ProfileInfoCache(PrefService* prefs,
       user_data_dir_(user_data_dir) {
   // Populate the cache
   DictionaryPrefUpdate update(prefs_, prefs::kProfileInfoCache);
-  DictionaryValue* cache = update.Get();
-  for (DictionaryValue::Iterator it(*cache); !it.IsAtEnd(); it.Advance()) {
-    DictionaryValue* info = NULL;
+  base::DictionaryValue* cache = update.Get();
+  for (base::DictionaryValue::Iterator it(*cache);
+       !it.IsAtEnd(); it.Advance()) {
+    base::DictionaryValue* info = NULL;
     cache->GetDictionaryWithoutPathExpansion(it.key(), &info);
     base::string16 name;
     info->GetString(kNameKey, &name);
@@ -209,9 +210,9 @@ void ProfileInfoCache::AddProfileToCache(const base::FilePath& profile_path,
                                          const std::string& managed_user_id) {
   std::string key = CacheKeyFromProfilePath(profile_path);
   DictionaryPrefUpdate update(prefs_, prefs::kProfileInfoCache);
-  DictionaryValue* cache = update.Get();
+  base::DictionaryValue* cache = update.Get();
 
-  scoped_ptr<DictionaryValue> info(new DictionaryValue);
+  scoped_ptr<base::DictionaryValue> info(new base::DictionaryValue);
   info->SetString(kNameKey, name);
   info->SetString(kUserNameKey, username);
   info->SetString(kAvatarIconKey, GetDefaultAvatarIconUrl(icon_index));
@@ -255,7 +256,7 @@ void ProfileInfoCache::DeleteProfileFromCache(
                     OnProfileWillBeRemoved(profile_path));
 
   DictionaryPrefUpdate update(prefs_, prefs::kProfileInfoCache);
-  DictionaryValue* cache = update.Get();
+  base::DictionaryValue* cache = update.Get();
   std::string key = CacheKeyFromProfilePath(profile_path);
   cache->Remove(key, NULL);
   sorted_keys_.erase(std::find(sorted_keys_.begin(), sorted_keys_.end(), key));
@@ -477,7 +478,8 @@ size_t ProfileInfoCache::GetAvatarIconIndexOfProfileAtIndex(size_t index)
 
 void ProfileInfoCache::SetNameOfProfileAtIndex(size_t index,
                                                const base::string16& name) {
-  scoped_ptr<DictionaryValue> info(GetInfoForProfileAtIndex(index)->DeepCopy());
+  scoped_ptr<base::DictionaryValue> info(
+      GetInfoForProfileAtIndex(index)->DeepCopy());
   base::string16 current_name;
   info->GetString(kNameKey, &current_name);
   if (name == current_name)
@@ -503,7 +505,8 @@ void ProfileInfoCache::SetShortcutNameOfProfileAtIndex(
     const base::string16& shortcut_name) {
   if (shortcut_name == GetShortcutNameOfProfileAtIndex(index))
     return;
-  scoped_ptr<DictionaryValue> info(GetInfoForProfileAtIndex(index)->DeepCopy());
+  scoped_ptr<base::DictionaryValue> info(
+      GetInfoForProfileAtIndex(index)->DeepCopy());
   info->SetString(kShortcutNameKey, shortcut_name);
   // This takes ownership of |info|.
   SetInfoForProfileAtIndex(index, info.release());
@@ -515,7 +518,8 @@ void ProfileInfoCache::SetUserNameOfProfileAtIndex(
   if (user_name == GetUserNameOfProfileAtIndex(index))
     return;
 
-  scoped_ptr<DictionaryValue> info(GetInfoForProfileAtIndex(index)->DeepCopy());
+  scoped_ptr<base::DictionaryValue> info(
+      GetInfoForProfileAtIndex(index)->DeepCopy());
   info->SetString(kUserNameKey, user_name);
   // This takes ownership of |info|.
   SetInfoForProfileAtIndex(index, info.release());
@@ -523,7 +527,8 @@ void ProfileInfoCache::SetUserNameOfProfileAtIndex(
 
 void ProfileInfoCache::SetAvatarIconOfProfileAtIndex(size_t index,
                                                      size_t icon_index) {
-  scoped_ptr<DictionaryValue> info(GetInfoForProfileAtIndex(index)->DeepCopy());
+  scoped_ptr<base::DictionaryValue> info(
+      GetInfoForProfileAtIndex(index)->DeepCopy());
   info->SetString(kAvatarIconKey, GetDefaultAvatarIconUrl(icon_index));
   // This takes ownership of |info|.
   SetInfoForProfileAtIndex(index, info.release());
@@ -536,7 +541,8 @@ void ProfileInfoCache::SetAvatarIconOfProfileAtIndex(size_t index,
 
 void ProfileInfoCache::SetManagedUserIdOfProfileAtIndex(size_t index,
                                                         const std::string& id) {
-  scoped_ptr<DictionaryValue> info(GetInfoForProfileAtIndex(index)->DeepCopy());
+  scoped_ptr<base::DictionaryValue> info(
+      GetInfoForProfileAtIndex(index)->DeepCopy());
   info->SetString(kManagedUserId, id);
   // This takes ownership of |info|.
   SetInfoForProfileAtIndex(index, info.release());
@@ -545,7 +551,8 @@ void ProfileInfoCache::SetManagedUserIdOfProfileAtIndex(size_t index,
 void ProfileInfoCache::SetLocalAuthCredentialsOfProfileAtIndex(
     size_t index,
     const std::string& credentials) {
-  scoped_ptr<DictionaryValue> info(GetInfoForProfileAtIndex(index)->DeepCopy());
+  scoped_ptr<base::DictionaryValue> info(
+      GetInfoForProfileAtIndex(index)->DeepCopy());
   info->SetString(kAuthCredentialsKey, credentials);
   // This takes ownership of |info|.
   SetInfoForProfileAtIndex(index, info.release());
@@ -556,7 +563,8 @@ void ProfileInfoCache::SetBackgroundStatusOfProfileAtIndex(
     bool running_background_apps) {
   if (GetBackgroundStatusOfProfileAtIndex(index) == running_background_apps)
     return;
-  scoped_ptr<DictionaryValue> info(GetInfoForProfileAtIndex(index)->DeepCopy());
+  scoped_ptr<base::DictionaryValue> info(
+      GetInfoForProfileAtIndex(index)->DeepCopy());
   info->SetBoolean(kBackgroundAppsKey, running_background_apps);
   // This takes ownership of |info|.
   SetInfoForProfileAtIndex(index, info.release());
@@ -568,7 +576,8 @@ void ProfileInfoCache::SetGAIANameOfProfileAtIndex(size_t index,
     return;
 
   base::string16 old_display_name = GetNameOfProfileAtIndex(index);
-  scoped_ptr<DictionaryValue> info(GetInfoForProfileAtIndex(index)->DeepCopy());
+  scoped_ptr<base::DictionaryValue> info(
+      GetInfoForProfileAtIndex(index)->DeepCopy());
   info->SetString(kGAIANameKey, name);
   // This takes ownership of |info|.
   SetInfoForProfileAtIndex(index, info.release());
@@ -589,7 +598,8 @@ void ProfileInfoCache::SetGAIAGivenNameOfProfileAtIndex(
   if (name == GetGAIAGivenNameOfProfileAtIndex(index))
     return;
 
-  scoped_ptr<DictionaryValue> info(GetInfoForProfileAtIndex(index)->DeepCopy());
+  scoped_ptr<base::DictionaryValue> info(
+      GetInfoForProfileAtIndex(index)->DeepCopy());
   info->SetString(kGAIAGivenNameKey, name);
   // This takes ownership of |info|.
   SetInfoForProfileAtIndex(index, info.release());
@@ -601,7 +611,8 @@ void ProfileInfoCache::SetIsUsingGAIANameOfProfileAtIndex(size_t index,
     return;
 
   base::string16 old_display_name = GetNameOfProfileAtIndex(index);
-  scoped_ptr<DictionaryValue> info(GetInfoForProfileAtIndex(index)->DeepCopy());
+  scoped_ptr<base::DictionaryValue> info(
+      GetInfoForProfileAtIndex(index)->DeepCopy());
   info->SetBoolean(kUseGAIANameKey, value);
   // This takes ownership of |info|.
   SetInfoForProfileAtIndex(index, info.release());
@@ -660,7 +671,8 @@ void ProfileInfoCache::SetGAIAPictureOfProfileAtIndex(size_t index,
     }
   }
 
-  scoped_ptr<DictionaryValue> info(GetInfoForProfileAtIndex(index)->DeepCopy());
+  scoped_ptr<base::DictionaryValue> info(
+      GetInfoForProfileAtIndex(index)->DeepCopy());
   info->SetString(kGAIAPictureFileNameKey, new_file_name);
   // This takes ownership of |info|.
   SetInfoForProfileAtIndex(index, info.release());
@@ -672,7 +684,8 @@ void ProfileInfoCache::SetGAIAPictureOfProfileAtIndex(size_t index,
 
 void ProfileInfoCache::SetIsUsingGAIAPictureOfProfileAtIndex(size_t index,
                                                              bool value) {
-  scoped_ptr<DictionaryValue> info(GetInfoForProfileAtIndex(index)->DeepCopy());
+  scoped_ptr<base::DictionaryValue> info(
+      GetInfoForProfileAtIndex(index)->DeepCopy());
   info->SetBoolean(kUseGAIAPictureKey, value);
   // This takes ownership of |info|.
   SetInfoForProfileAtIndex(index, info.release());
@@ -689,7 +702,8 @@ void ProfileInfoCache::SetProfileSigninRequiredAtIndex(size_t index,
   if (value == ProfileIsSigninRequiredAtIndex(index))
     return;
 
-  scoped_ptr<DictionaryValue> info(GetInfoForProfileAtIndex(index)->DeepCopy());
+  scoped_ptr<base::DictionaryValue> info(
+      GetInfoForProfileAtIndex(index)->DeepCopy());
   info->SetBoolean(kSigninRequiredKey, value);
   // This takes ownership of |info|.
   SetInfoForProfileAtIndex(index, info.release());
@@ -699,7 +713,8 @@ void ProfileInfoCache::SetProfileIsEphemeralAtIndex(size_t index, bool value) {
   if (value == ProfileIsEphemeralAtIndex(index))
     return;
 
-  scoped_ptr<DictionaryValue> info(GetInfoForProfileAtIndex(index)->DeepCopy());
+  scoped_ptr<base::DictionaryValue> info(
+      GetInfoForProfileAtIndex(index)->DeepCopy());
   info->SetBoolean(kProfileIsEphemeral, value);
   // This takes ownership of |info|.
   SetInfoForProfileAtIndex(index, info.release());
@@ -742,7 +757,8 @@ bool ProfileInfoCache::GetHasMigratedToGAIAInfoOfProfileAtIndex(
 
 void ProfileInfoCache::SetHasMigratedToGAIAInfoOfProfileAtIndex(
     size_t index, bool value) {
-  scoped_ptr<DictionaryValue> info(GetInfoForProfileAtIndex(index)->DeepCopy());
+  scoped_ptr<base::DictionaryValue> info(
+      GetInfoForProfileAtIndex(index)->DeepCopy());
   info->SetBoolean(kHasMigratedToGAIAInfoKey, value);
   // This takes ownership of |info|.
   SetInfoForProfileAtIndex(index, info.release());
@@ -840,20 +856,20 @@ bool ProfileInfoCache::IsDefaultAvatarIconUrl(const std::string& url,
   return false;
 }
 
-const DictionaryValue* ProfileInfoCache::GetInfoForProfileAtIndex(
+const base::DictionaryValue* ProfileInfoCache::GetInfoForProfileAtIndex(
     size_t index) const {
   DCHECK_LT(index, GetNumberOfProfiles());
-  const DictionaryValue* cache =
+  const base::DictionaryValue* cache =
       prefs_->GetDictionary(prefs::kProfileInfoCache);
-  const DictionaryValue* info = NULL;
+  const base::DictionaryValue* info = NULL;
   cache->GetDictionaryWithoutPathExpansion(sorted_keys_[index], &info);
   return info;
 }
 
 void ProfileInfoCache::SetInfoForProfileAtIndex(size_t index,
-                                                DictionaryValue* info) {
+                                                base::DictionaryValue* info) {
   DictionaryPrefUpdate update(prefs_, prefs::kProfileInfoCache);
-  DictionaryValue* cache = update.Get();
+  base::DictionaryValue* cache = update.Get();
   cache->SetWithoutPathExpansion(sorted_keys_[index], info);
 
   content::NotificationService::current()->Notify(
@@ -908,7 +924,7 @@ void ProfileInfoCache::UpdateSortForProfileIndex(size_t index) {
 std::vector<base::string16> ProfileInfoCache::GetProfileNames() {
   std::vector<base::string16> names;
   PrefService* local_state = g_browser_process->local_state();
-  const DictionaryValue* cache = local_state->GetDictionary(
+  const base::DictionaryValue* cache = local_state->GetDictionary(
       prefs::kProfileInfoCache);
   base::string16 name;
   for (base::DictionaryValue::Iterator it(*cache); !it.IsAtEnd();
diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc
index c10973a..df89d22 100644
--- a/chrome/browser/profiles/profile_manager.cc
+++ b/chrome/browser/profiles/profile_manager.cc
@@ -708,7 +708,7 @@ void ProfileManager::Observe(
     PrefService* local_state = g_browser_process->local_state();
     DCHECK(local_state);
     ListPrefUpdate update(local_state, prefs::kProfilesLastActive);
-    ListValue* profile_list = update.Get();
+    base::ListValue* profile_list = update.Get();
 
     profile_list->Clear();
 
@@ -724,7 +724,7 @@ void ProfileManager::Observe(
       if (!(*it)->GetPrefs()->GetBoolean(prefs::kForceEphemeralProfiles) &&
           profile_paths.find(profile_path) == profile_paths.end()) {
         profile_paths.insert(profile_path);
-        profile_list->Append(new StringValue(profile_path));
+        profile_list->Append(new base::StringValue(profile_path));
       }
     }
   }
diff --git a/chrome/browser/profiles/profile_manager_unittest.cc b/chrome/browser/profiles/profile_manager_unittest.cc
index 205665c..44b4d1b 100644
--- a/chrome/browser/profiles/profile_manager_unittest.cc
+++ b/chrome/browser/profiles/profile_manager_unittest.cc
@@ -304,7 +304,7 @@ TEST_F(ProfileManagerTest, AutoloadProfilesWithBackgroundApps) {
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();
   local_state_.Get()->SetUserPref(prefs::kBackgroundModeEnabled,
-                                  Value::CreateBooleanValue(true));
+                                  base::Value::CreateBooleanValue(true));
 
   // Setting a pref which is not applicable to a system (i.e., Android in this
   // case) does not necessarily create it. Don't bother continuing with the
@@ -336,7 +336,7 @@ TEST_F(ProfileManagerTest, DoNotAutoloadProfilesIfBackgroundModeOff) {
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();
   local_state_.Get()->SetUserPref(prefs::kBackgroundModeEnabled,
-                                  Value::CreateBooleanValue(false));
+                                  base::Value::CreateBooleanValue(false));
 
   EXPECT_EQ(0u, cache.GetNumberOfProfiles());
   cache.AddProfileToCache(cache.GetUserDataDir().AppendASCII("path_1"),
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
index 09e9b4d..2062dd2 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
@@ -854,7 +854,7 @@ SafeBrowsingBlockingPageV1::SafeBrowsingBlockingPageV1(
 
 std::string SafeBrowsingBlockingPageV1::GetHTMLContents() {
   // Load the HTML page and create the template components.
-  DictionaryValue strings;
+  base::DictionaryValue strings;
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   std::string html;
 
@@ -872,7 +872,7 @@ std::string SafeBrowsingBlockingPageV1::GetHTMLContents() {
 }
 
 void SafeBrowsingBlockingPageV1::PopulateStringDictionary(
-    DictionaryValue* strings,
+    base::DictionaryValue* strings,
     const base::string16& title,
     const base::string16& headline,
     const base::string16& description1,
@@ -888,7 +888,7 @@ void SafeBrowsingBlockingPageV1::PopulateStringDictionary(
 }
 
 void SafeBrowsingBlockingPageV1::PopulateMultipleThreatStringDictionary(
-    DictionaryValue* strings) {
+    base::DictionaryValue* strings) {
 
   base::string16 malware_label =
       l10n_util::GetStringUTF16(IDS_SAFE_BROWSING_MALWARE_LABEL);
@@ -899,12 +899,12 @@ void SafeBrowsingBlockingPageV1::PopulateMultipleThreatStringDictionary(
   base::string16 phishing_link =
       l10n_util::GetStringUTF16(IDS_SAFE_BROWSING_PHISHING_REPORT_ERROR);
 
-  ListValue* error_strings = new ListValue;
+  base::ListValue* error_strings = new base::ListValue;
   for (UnsafeResourceList::const_iterator iter = unsafe_resources_.begin();
        iter != unsafe_resources_.end(); ++iter) {
     const UnsafeResource& resource = *iter;
     SBThreatType threat_type = resource.threat_type;
-    DictionaryValue* current_error_strings = new DictionaryValue;
+    base::DictionaryValue* current_error_strings = new base::DictionaryValue;
     if (threat_type == SB_THREAT_TYPE_URL_MALWARE ||
         threat_type == SB_THREAT_TYPE_CLIENT_SIDE_MALWARE_URL) {
       current_error_strings->SetString("type", "malware");
@@ -974,12 +974,12 @@ void SafeBrowsingBlockingPageV1::PopulateMultipleThreatStringDictionary(
 }
 
 void SafeBrowsingBlockingPageV1::PopulateMalwareStringDictionary(
-    DictionaryValue* strings) {
+    base::DictionaryValue* strings) {
   NOTREACHED();
 }
 
 void SafeBrowsingBlockingPageV1::PopulatePhishingStringDictionary(
-    DictionaryValue* strings) {
+    base::DictionaryValue* strings) {
   NOTREACHED();
 }
 
@@ -1004,7 +1004,7 @@ SafeBrowsingBlockingPageV2::SafeBrowsingBlockingPageV2(
 
 std::string SafeBrowsingBlockingPageV2::GetHTMLContents() {
   // Load the HTML page and create the template components.
-  DictionaryValue strings;
+  base::DictionaryValue strings;
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   std::string html;
 
@@ -1035,7 +1035,7 @@ std::string SafeBrowsingBlockingPageV2::GetHTMLContents() {
 }
 
 void SafeBrowsingBlockingPageV2::PopulateStringDictionary(
-    DictionaryValue* strings,
+    base::DictionaryValue* strings,
     const base::string16& title,
     const base::string16& headline,
     const base::string16& description1,
@@ -1091,12 +1091,12 @@ void SafeBrowsingBlockingPageV2::PopulateStringDictionary(
 }
 
 void SafeBrowsingBlockingPageV2::PopulateMultipleThreatStringDictionary(
-    DictionaryValue* strings) {
+    base::DictionaryValue* strings) {
   NOTREACHED();
 }
 
 void SafeBrowsingBlockingPageV2::PopulateMalwareStringDictionary(
-    DictionaryValue* strings) {
+    base::DictionaryValue* strings) {
   // Check to see if we're blocking the main page, or a sub-resource on the
   // main page.
   base::string16 headline, description1, description2, description3;
@@ -1166,7 +1166,7 @@ void SafeBrowsingBlockingPageV2::PopulateMalwareStringDictionary(
 }
 
 void SafeBrowsingBlockingPageV2::PopulatePhishingStringDictionary(
-    DictionaryValue* strings) {
+    base::DictionaryValue* strings) {
   PopulateStringDictionary(
       strings,
       l10n_util::GetStringUTF16(IDS_SAFE_BROWSING_PHISHING_V2_TITLE),
diff --git a/chrome/browser/safe_json_parser.cc b/chrome/browser/safe_json_parser.cc
index 8ce8e6a..f8334ce 100644
--- a/chrome/browser/safe_json_parser.cc
+++ b/chrome/browser/safe_json_parser.cc
@@ -37,7 +37,7 @@ void SafeJsonParser::StartWorkOnIOThread() {
 
 void SafeJsonParser::OnJSONParseSucceeded(const base::ListValue& wrapper) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  const Value* value = NULL;
+  const base::Value* value = NULL;
   CHECK(wrapper.Get(0, &value));
 
   parsed_json_.reset(value->DeepCopy());
diff --git a/chrome/browser/search/local_ntp_source.cc b/chrome/browser/search/local_ntp_source.cc
index f53e1b8..6e668d7 100644
--- a/chrome/browser/search/local_ntp_source.cc
+++ b/chrome/browser/search/local_ntp_source.cc
@@ -81,7 +81,7 @@ void AddString(base::DictionaryValue* dictionary,
 }
 
 // Populates |translated_strings| dictionary for the local NTP.
-scoped_ptr<DictionaryValue> GetTranslatedStrings() {
+scoped_ptr<base::DictionaryValue> GetTranslatedStrings() {
   scoped_ptr<base::DictionaryValue> translated_strings(
       new base::DictionaryValue());
 
diff --git a/chrome/browser/search_engines/default_search_policy_handler.cc b/chrome/browser/search_engines/default_search_policy_handler.cc
index ae6c0de..0501878 100644
--- a/chrome/browser/search_engines/default_search_policy_handler.cc
+++ b/chrome/browser/search_engines/default_search_policy_handler.cc
@@ -24,59 +24,59 @@ namespace policy {
 const PolicyToPreferenceMapEntry kDefaultSearchPolicyMap[] = {
   { key::kDefaultSearchProviderEnabled,
     prefs::kDefaultSearchProviderEnabled,
-    Value::TYPE_BOOLEAN },
+    base::Value::TYPE_BOOLEAN },
   { key::kDefaultSearchProviderName,
     prefs::kDefaultSearchProviderName,
-    Value::TYPE_STRING },
+    base::Value::TYPE_STRING },
   { key::kDefaultSearchProviderKeyword,
     prefs::kDefaultSearchProviderKeyword,
-    Value::TYPE_STRING },
+    base::Value::TYPE_STRING },
   { key::kDefaultSearchProviderSearchURL,
     prefs::kDefaultSearchProviderSearchURL,
-    Value::TYPE_STRING },
+    base::Value::TYPE_STRING },
   { key::kDefaultSearchProviderSuggestURL,
     prefs::kDefaultSearchProviderSuggestURL,
-    Value::TYPE_STRING },
+    base::Value::TYPE_STRING },
   { key::kDefaultSearchProviderInstantURL,
     prefs::kDefaultSearchProviderInstantURL,
-    Value::TYPE_STRING },
+    base::Value::TYPE_STRING },
   { key::kDefaultSearchProviderIconURL,
     prefs::kDefaultSearchProviderIconURL,
-    Value::TYPE_STRING },
+    base::Value::TYPE_STRING },
   { key::kDefaultSearchProviderEncodings,
     prefs::kDefaultSearchProviderEncodings,
-    Value::TYPE_LIST },
+    base::Value::TYPE_LIST },
   { key::kDefaultSearchProviderAlternateURLs,
     prefs::kDefaultSearchProviderAlternateURLs,
-    Value::TYPE_LIST },
+    base::Value::TYPE_LIST },
   { key::kDefaultSearchProviderSearchTermsReplacementKey,
     prefs::kDefaultSearchProviderSearchTermsReplacementKey,
-    Value::TYPE_STRING },
+    base::Value::TYPE_STRING },
   { key::kDefaultSearchProviderImageURL,
     prefs::kDefaultSearchProviderImageURL,
-    Value::TYPE_STRING },
+    base::Value::TYPE_STRING },
   { key::kDefaultSearchProviderNewTabURL,
     prefs::kDefaultSearchProviderNewTabURL,
-    Value::TYPE_STRING },
+    base::Value::TYPE_STRING },
   { key::kDefaultSearchProviderSearchURLPostParams,
     prefs::kDefaultSearchProviderSearchURLPostParams,
-    Value::TYPE_STRING },
+    base::Value::TYPE_STRING },
   { key::kDefaultSearchProviderSuggestURLPostParams,
     prefs::kDefaultSearchProviderSuggestURLPostParams,
-    Value::TYPE_STRING },
+    base::Value::TYPE_STRING },
   { key::kDefaultSearchProviderInstantURLPostParams,
     prefs::kDefaultSearchProviderInstantURLPostParams,
-    Value::TYPE_STRING },
+    base::Value::TYPE_STRING },
   { key::kDefaultSearchProviderImageURLPostParams,
     prefs::kDefaultSearchProviderImageURLPostParams,
-    Value::TYPE_STRING },
+    base::Value::TYPE_STRING },
 };
 
 // DefaultSearchEncodingsPolicyHandler implementation --------------------------
 
 DefaultSearchEncodingsPolicyHandler::DefaultSearchEncodingsPolicyHandler()
     : TypeCheckingPolicyHandler(key::kDefaultSearchProviderEncodings,
-                                Value::TYPE_LIST) {}
+                                base::Value::TYPE_LIST) {}
 
 DefaultSearchEncodingsPolicyHandler::~DefaultSearchEncodingsPolicyHandler() {
 }
@@ -86,13 +86,13 @@ void DefaultSearchEncodingsPolicyHandler::ApplyPolicySettings(
   // The DefaultSearchProviderEncodings policy has type list, but the related
   // preference has type string. Convert one into the other here, using
   // ';' as a separator.
-  const Value* value = policies.GetValue(policy_name());
-  const ListValue* list;
+  const base::Value* value = policies.GetValue(policy_name());
+  const base::ListValue* list;
   if (!value || !value->GetAsList(&list))
     return;
 
-  ListValue::const_iterator iter(list->begin());
-  ListValue::const_iterator end(list->end());
+  base::ListValue::const_iterator iter(list->begin());
+  base::ListValue::const_iterator end(list->end());
   std::vector<std::string> string_parts;
   for (; iter != end; ++iter) {
     std::string s;
@@ -102,7 +102,7 @@ void DefaultSearchEncodingsPolicyHandler::ApplyPolicySettings(
   }
   std::string encodings = JoinString(string_parts, ';');
   prefs->SetValue(prefs::kDefaultSearchProviderEncodings,
-                  Value::CreateStringValue(encodings));
+                  base::Value::CreateStringValue(encodings));
 }
 
 
@@ -147,7 +147,7 @@ bool DefaultSearchPolicyHandler::CheckPolicySettings(const PolicyMap& policies,
     return true;
   }
 
-  const Value* url;
+  const base::Value* url;
   std::string dummy;
   if (DefaultSearchURLIsValid(policies, &url, &dummy) ||
       !AnyDefaultSearchPoliciesSpecified(policies))
@@ -172,7 +172,7 @@ void DefaultSearchPolicyHandler::ApplyPolicySettings(const PolicyMap& policies,
     prefs->SetString(prefs::kDefaultSearchProviderInstantURL, std::string());
     prefs->SetString(prefs::kDefaultSearchProviderNewTabURL, std::string());
     prefs->SetValue(prefs::kDefaultSearchProviderAlternateURLs,
-                    new ListValue());
+                    new base::ListValue());
     prefs->SetString(
         prefs::kDefaultSearchProviderSearchTermsReplacementKey, std::string());
     prefs->SetString(prefs::kDefaultSearchProviderImageURL, std::string());
@@ -188,7 +188,7 @@ void DefaultSearchPolicyHandler::ApplyPolicySettings(const PolicyMap& policies,
     // The search URL is required.  The other entries are optional.  Just make
     // sure that they are all specified via policy, so that the regular prefs
     // aren't used.
-    const Value* dummy;
+    const base::Value* dummy;
     std::string url;
     if (DefaultSearchURLIsValid(policies, &dummy, &url)) {
 
@@ -281,7 +281,7 @@ bool DefaultSearchPolicyHandler::AnyDefaultSearchPoliciesSpecified(
 
 bool DefaultSearchPolicyHandler::DefaultSearchProviderIsDisabled(
     const PolicyMap& policies) {
-  const Value* provider_enabled =
+  const base::Value* provider_enabled =
       policies.GetValue(key::kDefaultSearchProviderEnabled);
   bool enabled = true;
   return provider_enabled && provider_enabled->GetAsBoolean(&enabled) &&
@@ -290,7 +290,7 @@ bool DefaultSearchPolicyHandler::DefaultSearchProviderIsDisabled(
 
 bool DefaultSearchPolicyHandler::DefaultSearchURLIsValid(
     const PolicyMap& policies,
-    const Value** url_value,
+    const base::Value** url_value,
     std::string* url_string) {
   *url_value = policies.GetValue(key::kDefaultSearchProviderSearchURL);
   if (!*url_value || !(*url_value)->GetAsString(url_string) ||
@@ -317,7 +317,7 @@ void DefaultSearchPolicyHandler::EnsureListPrefExists(
   base::Value* value;
   base::ListValue* list_value;
   if (!prefs->GetValue(path, &value) || !value->GetAsList(&list_value))
-    prefs->SetValue(path, new ListValue());
+    prefs->SetValue(path, new base::ListValue());
 }
 
 }  // namespace policy
diff --git a/chrome/browser/search_engines/default_search_policy_handler.h b/chrome/browser/search_engines/default_search_policy_handler.h
index 1dca24d..1f62541 100644
--- a/chrome/browser/search_engines/default_search_policy_handler.h
+++ b/chrome/browser/search_engines/default_search_policy_handler.h
@@ -57,7 +57,7 @@ class DefaultSearchPolicyHandler : public ConfigurationPolicyHandler {
   // Returns whether the default search URL is set and valid.  On success, both
   // outparams (which must be non-NULL) are filled with the search URL.
   bool DefaultSearchURLIsValid(const PolicyMap& policies,
-                               const Value** url_value,
+                               const base::Value** url_value,
                                std::string* url_string);
 
   // Make sure that the |path| is present in |prefs_|.  If not, set it to
diff --git a/chrome/browser/search_engines/search_provider_install_data_unittest.cc b/chrome/browser/search_engines/search_provider_install_data_unittest.cc
index 9f043ee..a09d1a8 100644
--- a/chrome/browser/search_engines/search_provider_install_data_unittest.cc
+++ b/chrome/browser/search_engines/search_provider_install_data_unittest.cc
@@ -175,16 +175,16 @@ void SearchProviderInstallDataTest::SimulateDefaultSearchIsManaged(
   TestingPrefServiceSyncable* service =
       util_.profile()->GetTestingPrefService();
   service->SetManagedPref(prefs::kDefaultSearchProviderEnabled,
-                          Value::CreateBooleanValue(true));
+                          base::Value::CreateBooleanValue(true));
   service->SetManagedPref(prefs::kDefaultSearchProviderSearchURL,
-                          Value::CreateStringValue(url));
+                          base::Value::CreateStringValue(url));
   service->SetManagedPref(prefs::kDefaultSearchProviderName,
-                          Value::CreateStringValue("managed"));
+                          base::Value::CreateStringValue("managed"));
   // Clear the IDs that are not specified via policy.
   service->SetManagedPref(prefs::kDefaultSearchProviderID,
-                          new StringValue(std::string()));
+                          new base::StringValue(std::string()));
   service->SetManagedPref(prefs::kDefaultSearchProviderPrepopulateID,
-                          new StringValue(std::string()));
+                          new base::StringValue(std::string()));
   util_.model()->Observe(chrome::NOTIFICATION_DEFAULT_SEARCH_POLICY_CHANGED,
                          content::NotificationService::AllSources(),
                          content::NotificationService::NoDetails());
diff --git a/chrome/browser/search_engines/template_url_prepopulate_data.cc b/chrome/browser/search_engines/template_url_prepopulate_data.cc
index 19a52d5..14b7c77 100644
--- a/chrome/browser/search_engines/template_url_prepopulate_data.cc
+++ b/chrome/browser/search_engines/template_url_prepopulate_data.cc
@@ -1083,7 +1083,7 @@ TemplateURL* MakePrepopulatedTemplateURL(
     const base::StringPiece& image_url_post_params,
     const base::StringPiece& favicon_url,
     const base::StringPiece& encoding,
-    const ListValue& alternate_urls,
+    const base::ListValue& alternate_urls,
     const base::StringPiece& search_terms_replacement_key,
     int id) {
 
@@ -1122,14 +1122,14 @@ ScopedVector<TemplateURL> GetPrepopulatedTemplateFromPrefs(Profile* profile) {
   if (!profile)
     return t_urls.Pass();
 
-  const ListValue* list =
+  const base::ListValue* list =
       profile->GetPrefs()->GetList(prefs::kSearchProviderOverrides);
   if (!list)
     return t_urls.Pass();
 
   size_t num_engines = list->GetSize();
   for (size_t i = 0; i != num_engines; ++i) {
-    const DictionaryValue* engine;
+    const base::DictionaryValue* engine;
     base::string16 name;
     base::string16 keyword;
     std::string search_url;
@@ -1154,8 +1154,8 @@ ScopedVector<TemplateURL> GetPrepopulatedTemplateFromPrefs(Profile* profile) {
       std::string suggest_url_post_params;
       std::string instant_url_post_params;
       std::string image_url_post_params;
-      ListValue empty_list;
-      const ListValue* alternate_urls = &empty_list;
+      base::ListValue empty_list;
+      const base::ListValue* alternate_urls = &empty_list;
       std::string search_terms_replacement_key;
       engine->GetString("suggest_url", &suggest_url);
       engine->GetString("instant_url", &instant_url);
@@ -1184,7 +1184,7 @@ TemplateURL* MakePrepopulatedTemplateURLFromPrepopulateEngine(
     Profile* profile,
     const PrepopulatedEngine& engine) {
 
-  ListValue alternate_urls;
+  base::ListValue alternate_urls;
   if (engine.alternate_urls) {
     for (size_t i = 0; i < engine.alternate_urls_size; ++i)
       alternate_urls.AppendString(std::string(engine.alternate_urls[i]));
diff --git a/chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc b/chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc
index 4e33b43..ffb53b3 100644
--- a/chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc
+++ b/chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc
@@ -105,9 +105,9 @@ TEST(TemplateURLPrepopulateDataTest, ProvidersFromPrefs) {
   TestingProfile profile;
   TestingPrefServiceSyncable* prefs = profile.GetTestingPrefService();
   prefs->SetUserPref(prefs::kSearchProviderOverridesVersion,
-                     Value::CreateIntegerValue(1));
-  ListValue* overrides = new ListValue;
-  scoped_ptr<DictionaryValue> entry(new DictionaryValue);
+                     base::Value::CreateIntegerValue(1));
+  base::ListValue* overrides = new base::ListValue;
+  scoped_ptr<base::DictionaryValue> entry(new base::DictionaryValue);
   // Set only the minimal required settings for a search provider configuration.
   entry->SetString("name", "foo");
   entry->SetString("keyword", "fook");
@@ -141,11 +141,11 @@ TEST(TemplateURLPrepopulateDataTest, ProvidersFromPrefs) {
   // Test the optional settings too.
   entry->SetString("suggest_url", "http://foo.com/suggest?q={searchTerms}");
   entry->SetString("instant_url", "http://foo.com/instant?q={searchTerms}");
-  ListValue* alternate_urls = new ListValue;
+  base::ListValue* alternate_urls = new base::ListValue;
   alternate_urls->AppendString("http://foo.com/alternate?q={searchTerms}");
   entry->Set("alternate_urls", alternate_urls);
   entry->SetString("search_terms_replacement_key", "espv");
-  overrides = new ListValue;
+  overrides = new base::ListValue;
   overrides->Append(entry->DeepCopy());
   prefs->SetUserPref(prefs::kSearchProviderOverrides, overrides);
 
@@ -169,7 +169,7 @@ TEST(TemplateURLPrepopulateDataTest, ProvidersFromPrefs) {
 
   // Test that subsequent providers are loaded even if an intermediate
   // provider has an incomplete configuration.
-  overrides = new ListValue;
+  overrides = new base::ListValue;
   overrides->Append(entry->DeepCopy());
   entry->SetInteger("id", 1002);
   entry->SetString("name", "bar");
@@ -192,9 +192,9 @@ TEST(TemplateURLPrepopulateDataTest, ClearProvidersFromPrefs) {
   TestingProfile profile;
   TestingPrefServiceSyncable* prefs = profile.GetTestingPrefService();
   prefs->SetUserPref(prefs::kSearchProviderOverridesVersion,
-                     Value::CreateIntegerValue(1));
-  ListValue* overrides = new ListValue;
-  DictionaryValue* entry(new DictionaryValue);
+                     base::Value::CreateIntegerValue(1));
+  base::ListValue* overrides = new base::ListValue;
+  base::DictionaryValue* entry(new base::DictionaryValue);
   // Set only the minimal required settings for a search provider configuration.
   entry->SetString("name", "foo");
   entry->SetString("keyword", "fook");
diff --git a/chrome/browser/search_engines/template_url_service.cc b/chrome/browser/search_engines/template_url_service.cc
index b4d6c7a..a4d28d9 100644
--- a/chrome/browser/search_engines/template_url_service.cc
+++ b/chrome/browser/search_engines/template_url_service.cc
@@ -1626,7 +1626,7 @@ void TemplateURLService::SaveDefaultSearchProviderToPrefs(
   std::string keyword;
   std::string id_string;
   std::string prepopulate_id;
-  ListValue alternate_urls;
+  base::ListValue alternate_urls;
   std::string search_terms_replacement_key;
   if (t_url) {
     DCHECK_EQ(TemplateURL::NORMAL, t_url->GetType());
@@ -1735,7 +1735,7 @@ bool TemplateURLService::LoadDefaultSearchProviderFromPrefs(
   std::string id_string = prefs->GetString(prefs::kDefaultSearchProviderID);
   std::string prepopulate_id =
       prefs->GetString(prefs::kDefaultSearchProviderPrepopulateID);
-  const ListValue* alternate_urls =
+  const base::ListValue* alternate_urls =
       prefs->GetList(prefs::kDefaultSearchProviderAlternateURLs);
   std::string search_terms_replacement_key = prefs->GetString(
       prefs::kDefaultSearchProviderSearchTermsReplacementKey);
diff --git a/chrome/browser/search_engines/template_url_service_test_util.cc b/chrome/browser/search_engines/template_url_service_test_util.cc
index efae64f..3f61682 100644
--- a/chrome/browser/search_engines/template_url_service_test_util.cc
+++ b/chrome/browser/search_engines/template_url_service_test_util.cc
@@ -146,27 +146,27 @@ void TemplateURLServiceTestUtilBase::SetManagedDefaultSearchPreferences(
     const std::string& search_terms_replacement_key) {
   TestingPrefServiceSyncable* pref_service = profile()->GetTestingPrefService();
   pref_service->SetManagedPref(prefs::kDefaultSearchProviderEnabled,
-                               Value::CreateBooleanValue(enabled));
+                               base::Value::CreateBooleanValue(enabled));
   pref_service->SetManagedPref(prefs::kDefaultSearchProviderName,
-                               Value::CreateStringValue(name));
+                               base::Value::CreateStringValue(name));
   pref_service->SetManagedPref(prefs::kDefaultSearchProviderKeyword,
-                               Value::CreateStringValue(keyword));
+                               base::Value::CreateStringValue(keyword));
   pref_service->SetManagedPref(prefs::kDefaultSearchProviderSearchURL,
-                               Value::CreateStringValue(search_url));
+                               base::Value::CreateStringValue(search_url));
   pref_service->SetManagedPref(prefs::kDefaultSearchProviderSuggestURL,
-                               Value::CreateStringValue(suggest_url));
+                               base::Value::CreateStringValue(suggest_url));
   pref_service->SetManagedPref(prefs::kDefaultSearchProviderIconURL,
-                               Value::CreateStringValue(icon_url));
+                               base::Value::CreateStringValue(icon_url));
   pref_service->SetManagedPref(prefs::kDefaultSearchProviderEncodings,
-                               Value::CreateStringValue(encodings));
+                               base::Value::CreateStringValue(encodings));
   scoped_ptr<base::ListValue> alternate_url_list(new base::ListValue());
   if (!alternate_url.empty())
-    alternate_url_list->Append(Value::CreateStringValue(alternate_url));
+    alternate_url_list->Append(base::Value::CreateStringValue(alternate_url));
   pref_service->SetManagedPref(prefs::kDefaultSearchProviderAlternateURLs,
                                alternate_url_list.release());
   pref_service->SetManagedPref(
       prefs::kDefaultSearchProviderSearchTermsReplacementKey,
-      Value::CreateStringValue(search_terms_replacement_key));
+      base::Value::CreateStringValue(search_terms_replacement_key));
   model()->Observe(chrome::NOTIFICATION_DEFAULT_SEARCH_POLICY_CHANGED,
                    content::NotificationService::AllSources(),
                    content::NotificationService::NoDetails());
diff --git a/chrome/browser/services/gcm/gcm_profile_service_unittest.cc b/chrome/browser/services/gcm/gcm_profile_service_unittest.cc
index b9d15b6..cd01c4a 100644
--- a/chrome/browser/services/gcm/gcm_profile_service_unittest.cc
+++ b/chrome/browser/services/gcm/gcm_profile_service_unittest.cc
@@ -194,11 +194,11 @@ class GCMProfileServiceTest : public testing::Test,
     base::FilePath path(FILE_PATH_LITERAL("/foo"));
 #endif
 
-    DictionaryValue manifest;
+    base::DictionaryValue manifest;
     manifest.SetString(manifest_keys::kVersion, "1.0.0.0");
     manifest.SetString(manifest_keys::kName, kTestExtensionName);
-    ListValue* permission_list = new ListValue;
-    permission_list->Append(Value::CreateStringValue("gcm"));
+    base::ListValue* permission_list = new base::ListValue;
+    permission_list->Append(base::Value::CreateStringValue("gcm"));
     manifest.Set(manifest_keys::kPermissions, permission_list);
 
     // TODO(jianli): Once the GCM API enters stable, remove |channel|.
diff --git a/chrome/browser/sessions/restore_on_startup_policy_handler_unittest.cc b/chrome/browser/sessions/restore_on_startup_policy_handler_unittest.cc
index 7e44546..7147b6b 100644
--- a/chrome/browser/sessions/restore_on_startup_policy_handler_unittest.cc
+++ b/chrome/browser/sessions/restore_on_startup_policy_handler_unittest.cc
@@ -54,7 +54,7 @@ TEST_F(RestoreOnStartupPolicyHandlerTest, CheckPolicySettings_FailsTypeCheck) {
   EXPECT_EQ(l10n_util::GetStringFUTF16(
                 IDS_POLICY_TYPE_ERROR,
                 ASCIIToUTF16(ConfigurationPolicyHandler::ValueTypeToString(
-                    Value::TYPE_INTEGER))),
+                    base::Value::TYPE_INTEGER))),
             errors().begin()->second);
 }
 
diff --git a/chrome/browser/signin/about_signin_internals.cc b/chrome/browser/signin/about_signin_internals.cc
index 0fa6543..cdec3db 100644
--- a/chrome/browser/signin/about_signin_internals.cc
+++ b/chrome/browser/signin/about_signin_internals.cc
@@ -128,7 +128,7 @@ void AboutSigninInternals::NotifyObservers() {
                     OnSigninStateChanged(signin_status_.ToValue()));
 }
 
-scoped_ptr<DictionaryValue> AboutSigninInternals::GetSigninStatus() {
+scoped_ptr<base::DictionaryValue> AboutSigninInternals::GetSigninStatus() {
   return signin_status_.ToValue().Pass();
 }
 
diff --git a/chrome/browser/signin/about_signin_internals.h b/chrome/browser/signin/about_signin_internals.h
index 11c6f67..fe93001 100644
--- a/chrome/browser/signin/about_signin_internals.h
+++ b/chrome/browser/signin/about_signin_internals.h
@@ -29,7 +29,8 @@ class AboutSigninInternals
    public:
     // |info| will contain the dictionary of signin_status_ values as indicated
     // in the comments for GetSigninStatus() below.
-    virtual void OnSigninStateChanged(scoped_ptr<DictionaryValue> info) = 0;
+    virtual void OnSigninStateChanged(
+        scoped_ptr<base::DictionaryValue> info) = 0;
   };
 
   AboutSigninInternals();
@@ -71,7 +72,7 @@ class AboutSigninInternals
   //     [ List of {"name": "foo-name", "token" : "foo-token",
   //                 "status": "foo_stat", "time" : "foo_time"} elems]
   //  }
-  scoped_ptr<DictionaryValue> GetSigninStatus();
+  scoped_ptr<base::DictionaryValue> GetSigninStatus();
 
   // Returns the time of the last fetch/refresh for the token specified by
   // |token_name|. See signin_internals_util::kTokenPrefsArray for valid token
diff --git a/chrome/browser/signin/signin_internals_util.cc b/chrome/browser/signin/signin_internals_util.cc
index 9c7a022..2842f48 100644
--- a/chrome/browser/signin/signin_internals_util.cc
+++ b/chrome/browser/signin/signin_internals_util.cc
@@ -41,8 +41,8 @@ TokenInfo::TokenInfo() {
 TokenInfo::~TokenInfo() {
 }
 
-DictionaryValue* TokenInfo::ToValue() {
-  scoped_ptr<DictionaryValue> token_info(new DictionaryValue());
+base::DictionaryValue* TokenInfo::ToValue() {
+  scoped_ptr<base::DictionaryValue> token_info(new base::DictionaryValue());
   token_info->SetString("service", service);
   token_info->SetString("token", truncated_token);
   token_info->SetString("status", status);
@@ -97,9 +97,10 @@ std::string TokenPrefPath(const std::string& token_name) {
 
 namespace {
 
-ListValue* AddSection(ListValue* parent_list, const std::string& title) {
-  scoped_ptr<DictionaryValue> section(new DictionaryValue());
-  ListValue* section_contents = new ListValue();
+base::ListValue* AddSection(base::ListValue* parent_list,
+                            const std::string& title) {
+  scoped_ptr<base::DictionaryValue> section(new base::DictionaryValue());
+  base::ListValue* section_contents = new base::ListValue();
 
   section->SetString("title", title);
   section->Set("data", section_contents);
@@ -107,10 +108,10 @@ ListValue* AddSection(ListValue* parent_list, const std::string& title) {
   return section_contents;
 }
 
-void AddSectionEntry(ListValue* section_list,
+void AddSectionEntry(base::ListValue* section_list,
                      const std::string& field_name,
                      const std::string& field_val) {
-  scoped_ptr<DictionaryValue> entry(new DictionaryValue());
+  scoped_ptr<base::DictionaryValue> entry(new base::DictionaryValue());
   entry->SetString("label", field_name);
   entry->SetString("value", field_val);
   section_list->Append(entry.release());
@@ -192,13 +193,13 @@ TimedSigninStatusValue SigninStatusFieldToLabel(
 
 } //  namespace
 
-scoped_ptr<DictionaryValue> SigninStatus::ToValue() {
-  scoped_ptr<DictionaryValue> signin_status(new DictionaryValue());
-  ListValue* signin_info = new ListValue();
+scoped_ptr<base::DictionaryValue> SigninStatus::ToValue() {
+  scoped_ptr<base::DictionaryValue> signin_status(new base::DictionaryValue());
+  base::ListValue* signin_info = new base::ListValue();
   signin_status->Set("signin_info", signin_info);
 
   // A summary of signin related info first.
-  ListValue* basic_info = AddSection(signin_info, "Basic Information");
+  base::ListValue* basic_info = AddSection(signin_info, "Basic Information");
   const std::string signin_status_string =
       untimed_signin_fields[USERNAME - UNTIMED_FIELDS_BEGIN].empty() ?
       "Not Signed In" : "Signed In";
@@ -214,7 +215,8 @@ scoped_ptr<DictionaryValue> SigninStatus::ToValue() {
       untimed_signin_fields[USERNAME - UNTIMED_FIELDS_BEGIN]);
 
   // Time and status information of the possible sign in types.
-  ListValue* detailed_info = AddSection(signin_info, "Last Signin Details");
+  base::ListValue* detailed_info =
+      AddSection(signin_info, "Last Signin Details");
   for (int i = TIMED_FIELDS_BEGIN; i < TIMED_FIELDS_END; ++i) {
     const std::string value_field =
         SigninStatusFieldToLabel(static_cast<TimedSigninStatusField>(i)).first;
@@ -228,12 +230,12 @@ scoped_ptr<DictionaryValue> SigninStatus::ToValue() {
   }
 
   // Token information for all services.
-  ListValue* token_info = new ListValue();
-  ListValue* token_details = AddSection(token_info, "Token Details");
+  base::ListValue* token_info = new base::ListValue();
+  base::ListValue* token_details = AddSection(token_info, "Token Details");
   signin_status->Set("token_info", token_info);
   for (std::map<std::string, TokenInfo>::iterator it = token_info_map.begin();
        it != token_info_map.end(); ++it) {
-    DictionaryValue* token_info = it->second.ToValue();
+    base::DictionaryValue* token_info = it->second.ToValue();
     token_details->Append(token_info);
   }
 
diff --git a/chrome/browser/signin/signin_internals_util.h b/chrome/browser/signin/signin_internals_util.h
index 1ea29fd..886632b 100644
--- a/chrome/browser/signin/signin_internals_util.h
+++ b/chrome/browser/signin/signin_internals_util.h
@@ -73,7 +73,7 @@ struct TokenInfo {
   TokenInfo();
   ~TokenInfo();
 
-  DictionaryValue* ToValue();
+  base::DictionaryValue* ToValue();
 };
 
 // Associates a service name with its token information.
@@ -115,7 +115,7 @@ struct SigninStatus {
   //     [ List of {"name": "foo-name", "token" : "foo-token",
   //                 "status": "foo_stat", "time" : "foo_time"} elems]
   //  }
-  scoped_ptr<DictionaryValue> ToValue();
+  scoped_ptr<base::DictionaryValue> ToValue();
 };
 
 // An Observer class for authentication and token diagnostic information.
diff --git a/chrome/browser/signin/signin_manager_factory.cc b/chrome/browser/signin/signin_manager_factory.cc
index 616a8ab..69b5090 100644
--- a/chrome/browser/signin/signin_manager_factory.cc
+++ b/chrome/browser/signin/signin_manager_factory.cc
@@ -80,7 +80,7 @@ void SigninManagerFactory::RegisterProfilePrefs(
       true,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterListPref(prefs::kReverseAutologinRejectedEmailList,
-                             new ListValue,
+                             new base::ListValue,
                              user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   chrome::RegisterLocalAuthPrefs(registry);
 }
diff --git a/chrome/browser/speech/extension_api/tts_engine_extension_api.cc b/chrome/browser/speech/extension_api/tts_engine_extension_api.cc
index a9cb0a4..9390ea2 100644
--- a/chrome/browser/speech/extension_api/tts_engine_extension_api.cc
+++ b/chrome/browser/speech/extension_api/tts_engine_extension_api.cc
@@ -133,12 +133,12 @@ void ExtensionTtsEngineSpeak(Utterance* utterance, const VoiceData& voice) {
   // utterance now.
   bool sends_end_event = voice.events.find(TTS_EVENT_END) != voice.events.end();
 
-  scoped_ptr<ListValue> args(new ListValue());
-  args->Set(0, Value::CreateStringValue(utterance->text()));
+  scoped_ptr<base::ListValue> args(new base::ListValue());
+  args->Set(0, base::Value::CreateStringValue(utterance->text()));
 
   // Pass through most options to the speech engine, but remove some
   // that are handled internally.
-  scoped_ptr<DictionaryValue> options(static_cast<DictionaryValue*>(
+  scoped_ptr<base::DictionaryValue> options(static_cast<base::DictionaryValue*>(
       utterance->options()->DeepCopy()));
   if (options->HasKey(constants::kRequiredEventTypesKey))
     options->Remove(constants::kRequiredEventTypesKey, NULL);
@@ -162,7 +162,7 @@ void ExtensionTtsEngineSpeak(Utterance* utterance, const VoiceData& voice) {
     options->SetString(constants::kLangKey, voice.lang);
 
   args->Set(1, options.release());
-  args->Set(2, Value::CreateIntegerValue(utterance->id()));
+  args->Set(2, base::Value::CreateIntegerValue(utterance->id()));
 
   scoped_ptr<extensions::Event> event(new extensions::Event(
       tts_engine_events::kOnSpeak, args.Pass()));
@@ -172,7 +172,7 @@ void ExtensionTtsEngineSpeak(Utterance* utterance, const VoiceData& voice) {
 }
 
 void ExtensionTtsEngineStop(Utterance* utterance) {
-  scoped_ptr<ListValue> args(new ListValue());
+  scoped_ptr<base::ListValue> args(new base::ListValue());
   scoped_ptr<extensions::Event> event(new extensions::Event(
       tts_engine_events::kOnStop, args.Pass()));
   event->restrict_to_browser_context = utterance->profile();
@@ -181,7 +181,7 @@ void ExtensionTtsEngineStop(Utterance* utterance) {
 }
 
 void ExtensionTtsEnginePause(Utterance* utterance) {
-  scoped_ptr<ListValue> args(new ListValue());
+  scoped_ptr<base::ListValue> args(new base::ListValue());
   scoped_ptr<extensions::Event> event(new extensions::Event(
       tts_engine_events::kOnPause, args.Pass()));
   Profile* profile = utterance->profile();
@@ -193,7 +193,7 @@ void ExtensionTtsEnginePause(Utterance* utterance) {
 }
 
 void ExtensionTtsEngineResume(Utterance* utterance) {
-  scoped_ptr<ListValue> args(new ListValue());
+  scoped_ptr<base::ListValue> args(new base::ListValue());
   scoped_ptr<extensions::Event> event(new extensions::Event(
       tts_engine_events::kOnResume, args.Pass()));
   Profile* profile = utterance->profile();
@@ -208,7 +208,7 @@ bool ExtensionTtsEngineSendTtsEventFunction::RunImpl() {
   int utterance_id;
   EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &utterance_id));
 
-  DictionaryValue* event;
+  base::DictionaryValue* event;
   EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(1, &event));
 
   std::string event_type;
diff --git a/chrome/browser/speech/extension_api/tts_extension_api.cc b/chrome/browser/speech/extension_api/tts_extension_api.cc
index 99914f5..e6a34bd 100644
--- a/chrome/browser/speech/extension_api/tts_extension_api.cc
+++ b/chrome/browser/speech/extension_api/tts_extension_api.cc
@@ -111,7 +111,7 @@ void TtsExtensionEventHandler::OnTtsEvent(Utterance* utterance,
   }
 
   const char *event_type_string = TtsEventTypeToString(event_type);
-  scoped_ptr<DictionaryValue> details(new DictionaryValue());
+  scoped_ptr<base::DictionaryValue> details(new base::DictionaryValue());
   if (char_index >= 0)
     details->SetInteger(constants::kCharIndexKey, char_index);
   details->SetString(constants::kEventTypeKey, event_type_string);
@@ -121,7 +121,7 @@ void TtsExtensionEventHandler::OnTtsEvent(Utterance* utterance,
   details->SetInteger(constants::kSrcIdKey, utterance->src_id());
   details->SetBoolean(constants::kIsFinalEventKey, utterance->finished());
 
-  scoped_ptr<ListValue> arguments(new ListValue());
+  scoped_ptr<base::ListValue> arguments(new base::ListValue());
   arguments->Set(0, details.release());
 
   scoped_ptr<extensions::Event> event(
@@ -144,9 +144,9 @@ bool TtsSpeakFunction::RunImpl() {
     return false;
   }
 
-  scoped_ptr<DictionaryValue> options(new DictionaryValue());
+  scoped_ptr<base::DictionaryValue> options(new base::DictionaryValue());
   if (args_->GetSize() >= 2) {
-    DictionaryValue* temp_options = NULL;
+    base::DictionaryValue* temp_options = NULL;
     if (args_->GetDictionary(1, &temp_options))
       options.reset(temp_options->DeepCopy());
   }
@@ -219,7 +219,7 @@ bool TtsSpeakFunction::RunImpl() {
 
   std::set<TtsEventType> required_event_types;
   if (options->HasKey(constants::kRequiredEventTypesKey)) {
-    ListValue* list;
+    base::ListValue* list;
     EXTENSION_FUNCTION_VALIDATE(
         options->GetList(constants::kRequiredEventTypesKey, &list));
     for (size_t i = 0; i < list->GetSize(); ++i) {
@@ -231,7 +231,7 @@ bool TtsSpeakFunction::RunImpl() {
 
   std::set<TtsEventType> desired_event_types;
   if (options->HasKey(constants::kDesiredEventTypesKey)) {
-    ListValue* list;
+    base::ListValue* list;
     EXTENSION_FUNCTION_VALIDATE(
         options->GetList(constants::kDesiredEventTypesKey, &list));
     for (size_t i = 0; i < list->GetSize(); ++i) {
@@ -302,7 +302,7 @@ bool TtsResumeFunction::RunImpl() {
 }
 
 bool TtsIsSpeakingFunction::RunImpl() {
-  SetResult(Value::CreateBooleanValue(
+  SetResult(base::Value::CreateBooleanValue(
       TtsController::GetInstance()->IsSpeaking()));
   return true;
 }
@@ -311,10 +311,10 @@ bool TtsGetVoicesFunction::RunImpl() {
   std::vector<VoiceData> voices;
   TtsController::GetInstance()->GetVoices(GetProfile(), &voices);
 
-  scoped_ptr<ListValue> result_voices(new ListValue());
+  scoped_ptr<base::ListValue> result_voices(new base::ListValue());
   for (size_t i = 0; i < voices.size(); ++i) {
     const VoiceData& voice = voices[i];
-    DictionaryValue* result_voice = new DictionaryValue();
+    base::DictionaryValue* result_voice = new base::DictionaryValue();
     result_voice->SetString(constants::kVoiceNameKey, voice.name);
     result_voice->SetBoolean(constants::kRemoteKey, voice.remote);
     if (!voice.lang.empty())
@@ -326,11 +326,11 @@ bool TtsGetVoicesFunction::RunImpl() {
     if (!voice.extension_id.empty())
       result_voice->SetString(constants::kExtensionIdKey, voice.extension_id);
 
-    ListValue* event_types = new ListValue();
+    base::ListValue* event_types = new base::ListValue();
     for (std::set<TtsEventType>::iterator iter = voice.events.begin();
          iter != voice.events.end(); ++iter) {
       const char* event_name_constant = TtsEventTypeToString(*iter);
-      event_types->Append(Value::CreateStringValue(event_name_constant));
+      event_types->Append(base::Value::CreateStringValue(event_name_constant));
     }
     result_voice->Set(constants::kEventTypesKey, event_types);
 
diff --git a/chrome/browser/speech/tts_controller.cc b/chrome/browser/speech/tts_controller.cc
index 1ca536f..a04adc1 100644
--- a/chrome/browser/speech/tts_controller.cc
+++ b/chrome/browser/speech/tts_controller.cc
@@ -78,7 +78,7 @@ Utterance::Utterance(Profile* profile)
       can_enqueue_(false),
       char_index_(0),
       finished_(false) {
-  options_.reset(new DictionaryValue());
+  options_.reset(new base::DictionaryValue());
 }
 
 Utterance::~Utterance() {
@@ -103,7 +103,7 @@ void Utterance::Finish() {
   finished_ = true;
 }
 
-void Utterance::set_options(const Value* options) {
+void Utterance::set_options(const base::Value* options) {
   options_.reset(options->DeepCopy());
 }
 
diff --git a/chrome/browser/spellchecker/spelling_service_client.cc b/chrome/browser/spellchecker/spelling_service_client.cc
index 248c2295..8ef8bcf 100644
--- a/chrome/browser/spellchecker/spelling_service_client.cc
+++ b/chrome/browser/spellchecker/spelling_service_client.cc
@@ -183,21 +183,21 @@ bool SpellingServiceClient::ParseResponse(
   //     "data": [...]
   //   }
   // }
-  scoped_ptr<DictionaryValue> value(
-      static_cast<DictionaryValue*>(
+  scoped_ptr<base::DictionaryValue> value(
+      static_cast<base::DictionaryValue*>(
           base::JSONReader::Read(data, base::JSON_ALLOW_TRAILING_COMMAS)));
   if (!value.get() || !value->IsType(base::Value::TYPE_DICTIONARY))
     return false;
 
   // Check for errors from spelling service.
-  DictionaryValue* error = NULL;
+  base::DictionaryValue* error = NULL;
   if (value->GetDictionary(kErrorPath, &error))
     return false;
 
   // Retrieve the array of Misspelling objects. When the input text does not
   // have misspelled words, it returns an empty JSON. (In this case, its HTTP
   // status is 200.) We just return true for this case.
-  ListValue* misspellings = NULL;
+  base::ListValue* misspellings = NULL;
   if (!value->GetList(kMisspellingsPath, &misspellings))
     return true;
 
@@ -205,20 +205,20 @@ bool SpellingServiceClient::ParseResponse(
     // Retrieve the i-th misspelling region and put it to the given vector. When
     // the Spelling service sends two or more suggestions, we read only the
     // first one because SpellCheckResult can store only one suggestion.
-    DictionaryValue* misspelling = NULL;
+    base::DictionaryValue* misspelling = NULL;
     if (!misspellings->GetDictionary(i, &misspelling))
       return false;
 
     int start = 0;
     int length = 0;
-    ListValue* suggestions = NULL;
+    base::ListValue* suggestions = NULL;
     if (!misspelling->GetInteger("charStart", &start) ||
         !misspelling->GetInteger("charLength", &length) ||
         !misspelling->GetList("suggestions", &suggestions)) {
       return false;
     }
 
-    DictionaryValue* suggestion = NULL;
+    base::DictionaryValue* suggestion = NULL;
     base::string16 replacement;
     if (!suggestions->GetDictionary(0, &suggestion) ||
         !suggestion->GetString("suggestion", &replacement)) {
diff --git a/chrome/browser/spellchecker/spelling_service_client_unittest.cc b/chrome/browser/spellchecker/spelling_service_client_unittest.cc
index 712b7b5..8fcdc23 100644
--- a/chrome/browser/spellchecker/spelling_service_client_unittest.cc
+++ b/chrome/browser/spellchecker/spelling_service_client_unittest.cc
@@ -55,7 +55,7 @@ class TestSpellingURLFetcher : public net::TestURLFetcher {
     EXPECT_EQ("application/json", upload_content_type);
 
     // Parse the JSON to be sent to the service, and verify its parameters.
-    scoped_ptr<DictionaryValue> value(static_cast<DictionaryValue*>(
+    scoped_ptr<base::DictionaryValue> value(static_cast<base::DictionaryValue*>(
         base::JSONReader::Read(upload_content,
                                base::JSON_ALLOW_TRAILING_COMMAS)));
     ASSERT_TRUE(!!value.get());
diff --git a/chrome/browser/ssl/ssl_blocking_page.cc b/chrome/browser/ssl/ssl_blocking_page.cc
index 4d3ab75..1e5d9c8 100644
--- a/chrome/browser/ssl/ssl_blocking_page.cc
+++ b/chrome/browser/ssl/ssl_blocking_page.cc
@@ -196,7 +196,7 @@ SSLBlockingPage::~SSLBlockingPage() {
 }
 
 std::string SSLBlockingPage::GetHTMLContents() {
-  DictionaryValue strings;
+  base::DictionaryValue strings;
   int resource_id;
   if (overridable_ && !strict_enforcement_) {
     // Let's build the overridable error page.
@@ -416,7 +416,7 @@ void SSLBlockingPage::NotifyAllowCertificate() {
 
 // static
 void SSLBlockingPage::SetExtraInfo(
-    DictionaryValue* strings,
+    base::DictionaryValue* strings,
     const std::vector<base::string16>& extra_info) {
   DCHECK_LT(extra_info.size(), 5U);  // We allow 5 paragraphs max.
   const char* keys[5] = {
diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc
index 74a74a4..e1b2d01 100644
--- a/chrome/browser/ssl/ssl_browser_tests.cc
+++ b/chrome/browser/ssl/ssl_browser_tests.cc
@@ -701,7 +701,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestWSSClientCert) {
   // cert selection.
   Profile* profile = Profile::FromBrowserContext(tab->GetBrowserContext());
   DCHECK(profile);
-  scoped_ptr<DictionaryValue> dict(new DictionaryValue());
+  scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
   dict->SetString("ISSUER.CN", "pywebsocket");
   profile->GetHostContentSettingsMap()->SetWebsiteSetting(
       ContentSettingsPattern::FromURL(url),
diff --git a/chrome/browser/sync/about_sync_util.cc b/chrome/browser/sync/about_sync_util.cc
index 3ef918f..88d852d 100644
--- a/chrome/browser/sync/about_sync_util.cc
+++ b/chrome/browser/sync/about_sync_util.cc
@@ -27,10 +27,10 @@ namespace {
 // Creates a 'section' for display on about:sync, consisting of a title and a
 // list of fields.  Returns a pointer to the new section.  Note that
 // |parent_list|, not the caller, owns the newly added section.
-ListValue* AddSection(ListValue* parent_list,
-                      const std::string& title) {
-  DictionaryValue* section = new DictionaryValue();
-  ListValue* section_contents = new ListValue();
+base::ListValue* AddSection(base::ListValue* parent_list,
+                            const std::string& title) {
+  base::DictionaryValue* section = new base::DictionaryValue();
+  base::ListValue* section_contents = new base::ListValue();
   section->SetString("title", title);
   section->Set("data", section_contents);
   section->SetBoolean("is_sensitive", false);
@@ -40,10 +40,10 @@ ListValue* AddSection(ListValue* parent_list,
 
 // Same as AddSection, but for data that should be elided when dumped into text
 // form and posted in a public forum (e.g. unique identifiers).
-ListValue* AddSensitiveSection(ListValue* parent_list,
-                               const std::string& title) {
-  DictionaryValue* section = new DictionaryValue();
-  ListValue* section_contents = new ListValue();
+base::ListValue* AddSensitiveSection(base::ListValue* parent_list,
+                                     const std::string& title) {
+  base::DictionaryValue* section = new base::DictionaryValue();
+  base::ListValue* section_contents = new base::ListValue();
   section->SetString("title", title);
   section->Set("data", section_contents);
   section->SetBoolean("is_sensitive", true);
@@ -60,17 +60,18 @@ ListValue* AddSensitiveSection(ListValue* parent_list,
 
 class StringSyncStat {
  public:
-  StringSyncStat(ListValue* section, const std::string& key);
+  StringSyncStat(base::ListValue* section, const std::string& key);
   void SetValue(const std::string& value);
   void SetValue(const base::string16& value);
 
  private:
   // Owned by the |section| passed in during construction.
-  DictionaryValue* stat_;
+  base::DictionaryValue* stat_;
 };
 
-StringSyncStat::StringSyncStat(ListValue* section, const std::string& key) {
-  stat_ = new DictionaryValue();
+StringSyncStat::StringSyncStat(base::ListValue* section,
+                               const std::string& key) {
+  stat_ = new base::DictionaryValue();
   stat_->SetString("stat_name", key);
   stat_->SetString("stat_value", "Uninitialized");
   stat_->SetBoolean("is_valid", false);
@@ -89,16 +90,16 @@ void StringSyncStat::SetValue(const base::string16& value) {
 
 class BoolSyncStat {
  public:
-  BoolSyncStat(ListValue* section, const std::string& key);
+  BoolSyncStat(base::ListValue* section, const std::string& key);
   void SetValue(bool value);
 
  private:
   // Owned by the |section| passed in during construction.
-  DictionaryValue* stat_;
+  base::DictionaryValue* stat_;
 };
 
-BoolSyncStat::BoolSyncStat(ListValue* section, const std::string& key) {
-  stat_ = new DictionaryValue();
+BoolSyncStat::BoolSyncStat(base::ListValue* section, const std::string& key) {
+  stat_ = new base::DictionaryValue();
   stat_->SetString("stat_name", key);
   stat_->SetBoolean("stat_value", false);
   stat_->SetBoolean("is_valid", false);
@@ -112,16 +113,16 @@ void BoolSyncStat::SetValue(bool value) {
 
 class IntSyncStat {
  public:
-  IntSyncStat(ListValue* section, const std::string& key);
+  IntSyncStat(base::ListValue* section, const std::string& key);
   void SetValue(int value);
 
  private:
   // Owned by the |section| passed in during construction.
-  DictionaryValue* stat_;
+  base::DictionaryValue* stat_;
 };
 
-IntSyncStat::IntSyncStat(ListValue* section, const std::string& key) {
-  stat_ = new DictionaryValue();
+IntSyncStat::IntSyncStat(base::ListValue* section, const std::string& key) {
+  stat_ = new base::DictionaryValue();
   stat_->SetString("stat_name", key);
   stat_->SetInteger("stat_value", 0);
   stat_->SetBoolean("is_valid", false);
@@ -207,27 +208,30 @@ namespace sync_ui_util {
 // its contents.  Most of the message consists of simple fields in about:sync
 // which are grouped into sections and populated with the help of the SyncStat
 // classes defined above.
-scoped_ptr<DictionaryValue> ConstructAboutInformation(
+scoped_ptr<base::DictionaryValue> ConstructAboutInformation(
     ProfileSyncService* service) {
-  scoped_ptr<DictionaryValue> about_info(new DictionaryValue());
-  ListValue* stats_list = new ListValue();  // 'details': A list of sections.
+  scoped_ptr<base::DictionaryValue> about_info(new base::DictionaryValue());
+
+  // 'details': A list of sections.
+  base::ListValue* stats_list = new base::ListValue();
 
   // The following lines define the sections and their fields.  For each field,
   // a class is instantiated, which allows us to reference the fields in
   // 'setter' code later on in this function.
-  ListValue* section_summary = AddSection(stats_list, "Summary");
+  base::ListValue* section_summary = AddSection(stats_list, "Summary");
   StringSyncStat summary_string(section_summary, "Summary");
 
-  ListValue* section_version = AddSection(stats_list, "Version Info");
+  base::ListValue* section_version = AddSection(stats_list, "Version Info");
   StringSyncStat client_version(section_version, "Client Version");
   StringSyncStat server_url(section_version, "Server URL");
 
-  ListValue* section_identity = AddSensitiveSection(stats_list, kIdentityTitle);
+  base::ListValue* section_identity =
+      AddSensitiveSection(stats_list, kIdentityTitle);
   StringSyncStat sync_id(section_identity, "Sync Client ID");
   StringSyncStat invalidator_id(section_identity, "Invalidator Client ID");
   StringSyncStat username(section_identity, "Username");
 
-  ListValue* section_credentials = AddSection(stats_list, "Credentials");
+  base::ListValue* section_credentials = AddSection(stats_list, "Credentials");
   StringSyncStat request_token_time(section_credentials, "Requested Token");
   StringSyncStat receive_token_time(section_credentials, "Received Token");
   StringSyncStat token_request_status(section_credentials,
@@ -235,7 +239,7 @@ scoped_ptr<DictionaryValue> ConstructAboutInformation(
   StringSyncStat next_token_request(section_credentials,
                                     "Next Token Request");
 
-  ListValue* section_local = AddSection(stats_list, "Local State");
+  base::ListValue* section_local = AddSection(stats_list, "Local State");
   StringSyncStat server_connection(section_local,
                                    "Server Connection");
   StringSyncStat last_synced(section_local, "Last Synced");
@@ -246,13 +250,13 @@ scoped_ptr<DictionaryValue> ConstructAboutInformation(
   BoolSyncStat is_syncing(section_local, "Syncing");
   BoolSyncStat is_token_available(section_local, "Sync Token Available");
 
-  ListValue* section_network = AddSection(stats_list, "Network");
+  base::ListValue* section_network = AddSection(stats_list, "Network");
   BoolSyncStat is_throttled(section_network, "Throttled");
   StringSyncStat retry_time(section_network, "Retry time (maybe stale)");
   BoolSyncStat are_notifications_enabled(section_network,
                                          "Notifications Enabled");
 
-  ListValue* section_encryption = AddSection(stats_list, "Encryption");
+  base::ListValue* section_encryption = AddSection(stats_list, "Encryption");
   BoolSyncStat is_using_explicit_passphrase(section_encryption,
                                             "Explicit Passphrase");
   BoolSyncStat is_passphrase_required(section_encryption,
@@ -270,14 +274,14 @@ scoped_ptr<DictionaryValue> ConstructAboutInformation(
   StringSyncStat passphrase_time(section_encryption,
                                  "Passphrase Time");
 
-  ListValue* section_last_session = AddSection(
+  base::ListValue* section_last_session = AddSection(
       stats_list, "Status from Last Completed Session");
   StringSyncStat session_source(section_last_session, "Sync Source");
   StringSyncStat get_key_result(section_last_session, "GetKey Step Result");
   StringSyncStat download_result(section_last_session, "Download Step Result");
   StringSyncStat commit_result(section_last_session, "Commit Step Result");
 
-  ListValue* section_counters = AddSection(stats_list, "Running Totals");
+  base::ListValue* section_counters = AddSection(stats_list, "Running Totals");
   IntSyncStat notifications_received(section_counters,
                                      "Notifications Received");
   IntSyncStat empty_get_updates(section_counters, "Cycles Without Updates");
@@ -298,7 +302,7 @@ scoped_ptr<DictionaryValue> ConstructAboutInformation(
   IntSyncStat conflicts_resolved_server_wins(section_counters,
                                       "Conflicts Resolved: Server Wins");
 
-  ListValue *section_this_cycle = AddSection(stats_list,
+  base::ListValue *section_this_cycle = AddSection(stats_list,
                                              "Transient Counters (this cycle)");
   IntSyncStat encryption_conflicts(section_this_cycle, "Encryption Conflicts");
   IntSyncStat hierarchy_conflicts(section_this_cycle, "Hierarchy Conflicts");
@@ -306,13 +310,13 @@ scoped_ptr<DictionaryValue> ConstructAboutInformation(
   IntSyncStat committed_items(section_this_cycle, "Committed Items");
   IntSyncStat updates_remaining(section_this_cycle, "Updates Remaining");
 
-  ListValue* section_that_cycle = AddSection(
+  base::ListValue* section_that_cycle = AddSection(
       stats_list, "Transient Counters (last cycle of last completed session)");
   IntSyncStat updates_downloaded(section_that_cycle, "Updates Downloaded");
   IntSyncStat committed_count(section_that_cycle, "Committed Count");
   IntSyncStat entries(section_that_cycle, "Entries");
 
-  ListValue* section_nudge_info = AddSection(
+  base::ListValue* section_nudge_info = AddSection(
       stats_list, "Nudge Source Counters");
   IntSyncStat nudge_source_notification(
       section_nudge_info, "Server Invalidations");
@@ -474,7 +478,7 @@ scoped_ptr<DictionaryValue> ConstructAboutInformation(
   // NOTE: We won't bother showing any of the following values unless
   // actionable_error_detected is set.
 
-  ListValue* actionable_error = new ListValue();
+  base::ListValue* actionable_error = new base::ListValue();
   about_info->Set("actionable_error", actionable_error);
 
   StringSyncStat error_type(actionable_error, "Error Type");
diff --git a/chrome/browser/sync/about_sync_util_unittest.cc b/chrome/browser/sync/about_sync_util_unittest.cc
index dc89b27..bf5befe 100644
--- a/chrome/browser/sync/about_sync_util_unittest.cc
+++ b/chrome/browser/sync/about_sync_util_unittest.cc
@@ -41,7 +41,8 @@ TEST(SyncUIUtilTestAbout, ConstructAboutInformationWithUnrecoverableErrorTest) {
   EXPECT_CALL(service, GetLastSyncedTimeString())
               .WillOnce(Return(str));
 
-  scoped_ptr<DictionaryValue> strings(ConstructAboutInformation(&service));
+  scoped_ptr<base::DictionaryValue> strings(
+      ConstructAboutInformation(&service));
 
   EXPECT_TRUE(strings->HasKey("unrecoverable_error_detected"));
 }
diff --git a/chrome/browser/sync/glue/extensions_activity_monitor_unittest.cc b/chrome/browser/sync/glue/extensions_activity_monitor_unittest.cc
index 9afdb3e..33bf971 100644
--- a/chrome/browser/sync/glue/extensions_activity_monitor_unittest.cc
+++ b/chrome/browser/sync/glue/extensions_activity_monitor_unittest.cc
@@ -33,7 +33,7 @@ scoped_refptr<Extension> MakeExtension(const std::string& name) {
   EXPECT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &path));
   path = path.AppendASCII(name);
 
-  DictionaryValue value;
+  base::DictionaryValue value;
   value.SetString(keys::kVersion, "1.0.0.0");
   value.SetString(keys::kName, name);
   std::string error;
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index 3fa370e..cd62155 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -1840,8 +1840,8 @@ void ProfileSyncService::GetModelSafeRoutingInfo(
   }
 }
 
-Value* ProfileSyncService::GetTypeStatusMap() const {
-  scoped_ptr<ListValue> result(new ListValue());
+base::Value* ProfileSyncService::GetTypeStatusMap() const {
+  scoped_ptr<base::ListValue> result(new base::ListValue());
 
   if (!backend_.get() || !backend_initialized_) {
     return result.release();
@@ -1866,7 +1866,8 @@ Value* ProfileSyncService::GetTypeStatusMap() const {
   SyncBackendHost::Status detailed_status = backend_->GetDetailedStatus();
   ModelTypeSet &throttled_types(detailed_status.throttled_types);
   ModelTypeSet registered = GetRegisteredDataTypes();
-  scoped_ptr<DictionaryValue> type_status_header(new DictionaryValue());
+  scoped_ptr<base::DictionaryValue> type_status_header(
+      new base::DictionaryValue());
 
   type_status_header->SetString("name", "Model Type");
   type_status_header->SetString("status", "header");
@@ -1875,11 +1876,11 @@ Value* ProfileSyncService::GetTypeStatusMap() const {
   type_status_header->SetString("num_live", "Live Entries");
   result->Append(type_status_header.release());
 
-  scoped_ptr<DictionaryValue> type_status;
+  scoped_ptr<base::DictionaryValue> type_status;
   for (ModelTypeSet::Iterator it = registered.First(); it.Good(); it.Inc()) {
     ModelType type = it.Get();
 
-    type_status.reset(new DictionaryValue());
+    type_status.reset(new base::DictionaryValue());
     type_status->SetString("name", ModelTypeToString(type));
 
     if (error_map.find(type) != error_map.end()) {
diff --git a/chrome/browser/sync/profile_sync_service.h b/chrome/browser/sync/profile_sync_service.h
index 23736e6..cd0f7c7 100644
--- a/chrome/browser/sync/profile_sync_service.h
+++ b/chrome/browser/sync/profile_sync_service.h
@@ -551,7 +551,7 @@ class ProfileSyncService
   // This function is used by sync_ui_util.cc to help populate the about:sync
   // page.  It returns a ListValue rather than a DictionaryValue in part to make
   // it easier to iterate over its elements when constructing that page.
-  Value* GetTypeStatusMap() const;
+  base::Value* GetTypeStatusMap() const;
 
   // Overridden by tests.
   // TODO(zea): Remove these and have the dtc's call directly into the SBH.
diff --git a/chrome/browser/sync/profile_sync_service_android.cc b/chrome/browser/sync/profile_sync_service_android.cc
index e93d81a..c0ce961 100644
--- a/chrome/browser/sync/profile_sync_service_android.cc
+++ b/chrome/browser/sync/profile_sync_service_android.cc
@@ -457,7 +457,7 @@ ScopedJavaLocalRef<jstring> ProfileSyncServiceAndroid::GetAboutInfoForTest(
     JNIEnv* env, jobject) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  scoped_ptr<DictionaryValue> about_info =
+  scoped_ptr<base::DictionaryValue> about_info =
       sync_ui_util::ConstructAboutInformation(sync_service_);
   std::string about_info_json;
   base::JSONWriter::Write(about_info.get(), &about_info_json);
diff --git a/chrome/browser/sync/profile_sync_service_preference_unittest.cc b/chrome/browser/sync/profile_sync_service_preference_unittest.cc
index b5a6dd1..6aca47d 100644
--- a/chrome/browser/sync/profile_sync_service_preference_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_preference_unittest.cc
@@ -54,7 +54,7 @@ using testing::_;
 using testing::Invoke;
 using testing::Return;
 
-typedef std::map<const std::string, const Value*> PreferenceValues;
+typedef std::map<const std::string, const base::Value*> PreferenceValues;
 
 ACTION_P(CreateAndSaveChangeProcessor, change_processor) {
   syncer::UserShare* user_share = arg0->GetUserShare();
@@ -80,7 +80,7 @@ class ProfileSyncServicePreferenceTest
     : public AbstractProfileSyncServiceTest,
       public syncer::DataTypeDebugInfoListener {
  public:
-  int64 SetSyncedValue(const std::string& name, const Value& value) {
+  int64 SetSyncedValue(const std::string& name, const base::Value& value) {
     syncer::WriteTransaction trans(FROM_HERE, sync_service_->GetUserShare());
     syncer::ReadNode root(&trans);
     if (root.InitByTagLookup(syncer::ModelTypeToRootTag(
@@ -206,14 +206,14 @@ class ProfileSyncServicePreferenceTest
     return true;
   }
 
-  const Value& GetPreferenceValue(const std::string& name) {
+  const base::Value& GetPreferenceValue(const std::string& name) {
     const PrefService::Preference* preference =
         prefs_->FindPreference(name.c_str());
     return *preference->GetValue();
   }
 
   // Caller gets ownership of the returned value.
-  const Value* GetSyncedValue(const std::string& name) {
+  const base::Value* GetSyncedValue(const std::string& name) {
     syncer::ReadTransaction trans(FROM_HERE, sync_service_->GetUserShare());
     syncer::ReadNode node(&trans);
 
@@ -229,7 +229,7 @@ class ProfileSyncServicePreferenceTest
   }
 
   int64 WriteSyncedValue(const std::string& name,
-                         const Value& value,
+                         const base::Value& value,
                          syncer::WriteNode* node) {
     syncer::SyncData sync_data;
     if (!pref_sync_service_->CreatePrefSyncData(name,
@@ -249,7 +249,7 @@ class ProfileSyncServicePreferenceTest
     return pref_sync_service_->IsPrefSynced(pref_name);
   }
 
-  std::string ValueString(const Value& value) {
+  std::string ValueString(const base::Value& value) {
     std::string serialized;
     JSONStringValueSerializer json(&serialized);
     json.Serialize(value);
@@ -329,7 +329,7 @@ TEST_F(ProfileSyncServicePreferenceTest, CreatePrefSyncData) {
       preference());
   EXPECT_EQ(std::string(prefs::kHomePage), specifics.name());
 
-  scoped_ptr<Value> value(base::JSONReader::Read(specifics.value()));
+  scoped_ptr<base::Value> value(base::JSONReader::Read(specifics.value()));
   EXPECT_TRUE(pref->GetValue()->Equals(value.get()));
 }
 
@@ -350,15 +350,15 @@ TEST_F(ProfileSyncServicePreferenceTest, ModelAssociationEmptyCloud) {
   prefs_->SetString(prefs::kHomePage, example_url0_);
   {
     ListPrefUpdate update(prefs_, prefs::kURLsToRestoreOnStartup);
-    ListValue* url_list = update.Get();
-    url_list->Append(Value::CreateStringValue(example_url0_));
-    url_list->Append(Value::CreateStringValue(example_url1_));
+    base::ListValue* url_list = update.Get();
+    url_list->Append(base::Value::CreateStringValue(example_url0_));
+    url_list->Append(base::Value::CreateStringValue(example_url1_));
   }
   CreateRootHelper create_root(this, syncer::PREFERENCES);
   ASSERT_TRUE(StartSyncService(create_root.callback(), false));
   ASSERT_TRUE(create_root.success());
 
-  scoped_ptr<const Value> value(GetSyncedValue(prefs::kHomePage));
+  scoped_ptr<const base::Value> value(GetSyncedValue(prefs::kHomePage));
   ASSERT_TRUE(value.get());
   EXPECT_TRUE(GetPreferenceValue(prefs::kHomePage).Equals(value.get()));
   value.reset(GetSyncedValue(prefs::kURLsToRestoreOnStartup));
@@ -371,36 +371,36 @@ TEST_F(ProfileSyncServicePreferenceTest, ModelAssociationCloudHasData) {
   prefs_->SetString(prefs::kHomePage, example_url0_);
   {
     ListPrefUpdate update(prefs_, prefs::kURLsToRestoreOnStartup);
-    ListValue* url_list = update.Get();
-    url_list->Append(Value::CreateStringValue(example_url0_));
-    url_list->Append(Value::CreateStringValue(example_url1_));
+    base::ListValue* url_list = update.Get();
+    url_list->Append(base::Value::CreateStringValue(example_url0_));
+    url_list->Append(base::Value::CreateStringValue(example_url1_));
   }
 
   PreferenceValues cloud_data;
   STLValueDeleter<PreferenceValues> cloud_data_deleter(&cloud_data);
-  cloud_data[prefs::kHomePage] = Value::CreateStringValue(example_url1_);
-  ListValue* urls_to_restore = new ListValue;
-  urls_to_restore->Append(Value::CreateStringValue(example_url1_));
-  urls_to_restore->Append(Value::CreateStringValue(example_url2_));
+  cloud_data[prefs::kHomePage] = base::Value::CreateStringValue(example_url1_);
+  base::ListValue* urls_to_restore = new base::ListValue;
+  urls_to_restore->Append(base::Value::CreateStringValue(example_url1_));
+  urls_to_restore->Append(base::Value::CreateStringValue(example_url2_));
   cloud_data[prefs::kURLsToRestoreOnStartup] = urls_to_restore;
   cloud_data[prefs::kDefaultCharset] =
-      Value::CreateStringValue(non_default_charset_value_);
+      base::Value::CreateStringValue(non_default_charset_value_);
 
   AddPreferenceEntriesHelper helper(this, cloud_data);
   ASSERT_TRUE(StartSyncService(helper.callback(), false));
   ASSERT_TRUE(helper.success());
 
-  scoped_ptr<const Value> value(GetSyncedValue(prefs::kHomePage));
+  scoped_ptr<const base::Value> value(GetSyncedValue(prefs::kHomePage));
   ASSERT_TRUE(value.get());
   std::string string_value;
   EXPECT_TRUE(value->GetAsString(&string_value));
   EXPECT_EQ(example_url1_, string_value);
   EXPECT_EQ(example_url1_, prefs_->GetString(prefs::kHomePage));
 
-  scoped_ptr<ListValue> expected_urls(new ListValue);
-  expected_urls->Append(Value::CreateStringValue(example_url1_));
-  expected_urls->Append(Value::CreateStringValue(example_url2_));
-  expected_urls->Append(Value::CreateStringValue(example_url0_));
+  scoped_ptr<base::ListValue> expected_urls(new base::ListValue);
+  expected_urls->Append(base::Value::CreateStringValue(example_url1_));
+  expected_urls->Append(base::Value::CreateStringValue(example_url2_));
+  expected_urls->Append(base::Value::CreateStringValue(example_url0_));
   value.reset(GetSyncedValue(prefs::kURLsToRestoreOnStartup));
   ASSERT_TRUE(value.get());
   EXPECT_TRUE(value->Equals(expected_urls.get()));
@@ -421,9 +421,9 @@ TEST_F(ProfileSyncServicePreferenceTest, ModelAssociationMigrateOldData) {
 
   PreferenceValues cloud_data;
   STLValueDeleter<PreferenceValues> cloud_data_deleter(&cloud_data);
-  ListValue* urls_to_restore = new ListValue;
-  urls_to_restore->Append(Value::CreateStringValue(example_url1_));
-  urls_to_restore->Append(Value::CreateStringValue(example_url2_));
+  base::ListValue* urls_to_restore = new base::ListValue;
+  urls_to_restore->Append(base::Value::CreateStringValue(example_url1_));
+  urls_to_restore->Append(base::Value::CreateStringValue(example_url2_));
   cloud_data[prefs::kURLsToRestoreOnStartupOld] = urls_to_restore;
 
   AddPreferenceEntriesHelper helper(this, cloud_data);
@@ -431,19 +431,20 @@ TEST_F(ProfileSyncServicePreferenceTest, ModelAssociationMigrateOldData) {
   ASSERT_TRUE(helper.success());
 
   // Expect that the new preference data contains the old pref's values.
-  scoped_ptr<ListValue> expected_urls(new ListValue);
-  expected_urls->Append(Value::CreateStringValue(example_url1_));
-  expected_urls->Append(Value::CreateStringValue(example_url2_));
+  scoped_ptr<base::ListValue> expected_urls(new base::ListValue);
+  expected_urls->Append(base::Value::CreateStringValue(example_url1_));
+  expected_urls->Append(base::Value::CreateStringValue(example_url2_));
 
   ASSERT_TRUE(HasSyncData(prefs::kURLsToRestoreOnStartup));
-  scoped_ptr<const Value> value(GetSyncedValue(prefs::kURLsToRestoreOnStartup));
+  scoped_ptr<const base::Value> value(
+      GetSyncedValue(prefs::kURLsToRestoreOnStartup));
   ASSERT_TRUE(value.get());
   EXPECT_TRUE(value->Equals(expected_urls.get()));
   EXPECT_TRUE(GetPreferenceValue(prefs::kURLsToRestoreOnStartup).
               Equals(expected_urls.get()));
 
   // The old preference value should be the same.
-  expected_urls.reset(new ListValue);
+  expected_urls.reset(new base::ListValue);
   value.reset(GetSyncedValue(prefs::kURLsToRestoreOnStartupOld));
   ASSERT_TRUE(value.get());
   EXPECT_TRUE(GetPreferenceValue(prefs::kURLsToRestoreOnStartupOld).
@@ -457,24 +458,24 @@ TEST_F(ProfileSyncServicePreferenceTest,
   prefs_->SetString(prefs::kHomePage, example_url0_);
   {
     ListPrefUpdate update(prefs_, prefs::kURLsToRestoreOnStartup);
-    ListValue* url_list = update.Get();
-    url_list->Append(Value::CreateStringValue(example_url0_));
-    url_list->Append(Value::CreateStringValue(example_url1_));
+    base::ListValue* url_list = update.Get();
+    url_list->Append(base::Value::CreateStringValue(example_url0_));
+    url_list->Append(base::Value::CreateStringValue(example_url1_));
   }
 
   PreferenceValues cloud_data;
   STLValueDeleter<PreferenceValues> cloud_data_deleter(&cloud_data);
-  cloud_data[prefs::kHomePage] = Value::CreateStringValue(example_url1_);
-  ListValue* urls_to_restore = new ListValue;
-  urls_to_restore->Append(Value::CreateStringValue(example_url1_));
-  urls_to_restore->Append(Value::CreateStringValue(example_url2_));
+  cloud_data[prefs::kHomePage] = base::Value::CreateStringValue(example_url1_);
+  base::ListValue* urls_to_restore = new base::ListValue;
+  urls_to_restore->Append(base::Value::CreateStringValue(example_url1_));
+  urls_to_restore->Append(base::Value::CreateStringValue(example_url2_));
   cloud_data[prefs::kURLsToRestoreOnStartupOld] = urls_to_restore;
 
   AddPreferenceEntriesHelper helper(this, cloud_data);
   ASSERT_TRUE(StartSyncService(helper.callback(), false));
   ASSERT_TRUE(helper.success());
 
-  scoped_ptr<const Value> value(GetSyncedValue(prefs::kHomePage));
+  scoped_ptr<const base::Value> value(GetSyncedValue(prefs::kHomePage));
   ASSERT_TRUE(value.get());
   std::string string_value;
   EXPECT_TRUE(value->GetAsString(&string_value));
@@ -482,10 +483,10 @@ TEST_F(ProfileSyncServicePreferenceTest,
   EXPECT_EQ(example_url1_, prefs_->GetString(prefs::kHomePage));
 
   // Expect that the new preference data contains the merged old prefs values.
-  scoped_ptr<ListValue> expected_urls(new ListValue);
-  expected_urls->Append(Value::CreateStringValue(example_url1_));
-  expected_urls->Append(Value::CreateStringValue(example_url2_));
-  expected_urls->Append(Value::CreateStringValue(example_url0_));
+  scoped_ptr<base::ListValue> expected_urls(new base::ListValue);
+  expected_urls->Append(base::Value::CreateStringValue(example_url1_));
+  expected_urls->Append(base::Value::CreateStringValue(example_url2_));
+  expected_urls->Append(base::Value::CreateStringValue(example_url0_));
 
   ASSERT_TRUE(HasSyncData(prefs::kURLsToRestoreOnStartup));
   value.reset(GetSyncedValue(prefs::kURLsToRestoreOnStartup));
@@ -495,7 +496,7 @@ TEST_F(ProfileSyncServicePreferenceTest,
               Equals(expected_urls.get()));
 
   // The old preference name should also contain the merged sync data.
-  expected_urls.reset(new ListValue);
+  expected_urls.reset(new base::ListValue);
   value.reset(GetSyncedValue(prefs::kURLsToRestoreOnStartupOld));
   ASSERT_TRUE(value.get());
   EXPECT_TRUE(GetPreferenceValue(prefs::kURLsToRestoreOnStartupOld).
@@ -509,24 +510,24 @@ TEST_F(ProfileSyncServicePreferenceTest,
   prefs_->SetString(prefs::kHomePage, example_url0_);
   {
     ListPrefUpdate update(prefs_, prefs::kURLsToRestoreOnStartupOld);
-    ListValue* url_list = update.Get();
-    url_list->Append(Value::CreateStringValue(example_url0_));
-    url_list->Append(Value::CreateStringValue(example_url1_));
+    base::ListValue* url_list = update.Get();
+    url_list->Append(base::Value::CreateStringValue(example_url0_));
+    url_list->Append(base::Value::CreateStringValue(example_url1_));
   }
 
   PreferenceValues cloud_data;
   STLValueDeleter<PreferenceValues> cloud_data_deleter(&cloud_data);
-  cloud_data[prefs::kHomePage] = Value::CreateStringValue(example_url1_);
-  ListValue* urls_to_restore = new ListValue;
-  urls_to_restore->Append(Value::CreateStringValue(example_url1_));
-  urls_to_restore->Append(Value::CreateStringValue(example_url2_));
+  cloud_data[prefs::kHomePage] = base::Value::CreateStringValue(example_url1_);
+  base::ListValue* urls_to_restore = new base::ListValue;
+  urls_to_restore->Append(base::Value::CreateStringValue(example_url1_));
+  urls_to_restore->Append(base::Value::CreateStringValue(example_url2_));
   cloud_data[prefs::kURLsToRestoreOnStartup] = urls_to_restore;
 
   AddPreferenceEntriesHelper helper(this, cloud_data);
   ASSERT_TRUE(StartSyncService(helper.callback(), false));
   ASSERT_TRUE(helper.success());
 
-  scoped_ptr<const Value> value(GetSyncedValue(prefs::kHomePage));
+  scoped_ptr<const base::Value> value(GetSyncedValue(prefs::kHomePage));
   ASSERT_TRUE(value.get());
   std::string string_value;
   EXPECT_TRUE(value->GetAsString(&string_value));
@@ -534,9 +535,9 @@ TEST_F(ProfileSyncServicePreferenceTest,
   EXPECT_EQ(example_url1_, prefs_->GetString(prefs::kHomePage));
 
   // Expect that the cloud data under the new migrated preference name sticks.
-  scoped_ptr<ListValue> expected_urls(new ListValue);
-  expected_urls->Append(Value::CreateStringValue(example_url1_));
-  expected_urls->Append(Value::CreateStringValue(example_url2_));
+  scoped_ptr<base::ListValue> expected_urls(new base::ListValue);
+  expected_urls->Append(base::Value::CreateStringValue(example_url1_));
+  expected_urls->Append(base::Value::CreateStringValue(example_url2_));
 
   ASSERT_TRUE(HasSyncData(prefs::kURLsToRestoreOnStartup));
   value.reset(GetSyncedValue(prefs::kURLsToRestoreOnStartup));
@@ -546,9 +547,9 @@ TEST_F(ProfileSyncServicePreferenceTest,
               Equals(expected_urls.get()));
 
   // The old preference data should still be here, though not synced.
-  expected_urls.reset(new ListValue);
-  expected_urls->Append(Value::CreateStringValue(example_url0_));
-  expected_urls->Append(Value::CreateStringValue(example_url1_));
+  expected_urls.reset(new base::ListValue);
+  expected_urls->Append(base::Value::CreateStringValue(example_url0_));
+  expected_urls->Append(base::Value::CreateStringValue(example_url1_));
 
   value.reset(GetSyncedValue(prefs::kURLsToRestoreOnStartupOld));
   ASSERT_FALSE(value.get());
@@ -563,24 +564,24 @@ TEST_F(ProfileSyncServicePreferenceTest,
   prefs_->SetString(prefs::kHomePage, example_url0_);
   {
     ListPrefUpdate update_old(prefs_, prefs::kURLsToRestoreOnStartupOld);
-    ListValue* url_list_old = update_old.Get();
-    url_list_old->Append(Value::CreateStringValue(example_url0_));
-    url_list_old->Append(Value::CreateStringValue(example_url1_));
+    base::ListValue* url_list_old = update_old.Get();
+    url_list_old->Append(base::Value::CreateStringValue(example_url0_));
+    url_list_old->Append(base::Value::CreateStringValue(example_url1_));
     ListPrefUpdate update(prefs_, prefs::kURLsToRestoreOnStartup);
-    ListValue* url_list = update.Get();
-    url_list->Append(Value::CreateStringValue(example_url1_));
-    url_list->Append(Value::CreateStringValue(example_url2_));
+    base::ListValue* url_list = update.Get();
+    url_list->Append(base::Value::CreateStringValue(example_url1_));
+    url_list->Append(base::Value::CreateStringValue(example_url2_));
   }
 
   PreferenceValues cloud_data;
   STLValueDeleter<PreferenceValues> cloud_data_deleter(&cloud_data);
-  cloud_data[prefs::kHomePage] = Value::CreateStringValue(example_url1_);
+  cloud_data[prefs::kHomePage] = base::Value::CreateStringValue(example_url1_);
 
   AddPreferenceEntriesHelper helper(this, cloud_data);
   ASSERT_TRUE(StartSyncService(helper.callback(), false));
   ASSERT_TRUE(helper.success());
 
-  scoped_ptr<const Value> value(GetSyncedValue(prefs::kHomePage));
+  scoped_ptr<const base::Value> value(GetSyncedValue(prefs::kHomePage));
   ASSERT_TRUE(value.get());
   std::string string_value;
   EXPECT_TRUE(value->GetAsString(&string_value));
@@ -588,9 +589,9 @@ TEST_F(ProfileSyncServicePreferenceTest,
   EXPECT_EQ(example_url1_, prefs_->GetString(prefs::kHomePage));
 
   // Expect that the cloud data under the new migrated preference name sticks.
-  scoped_ptr<ListValue> expected_urls(new ListValue);
-  expected_urls->Append(Value::CreateStringValue(example_url1_));
-  expected_urls->Append(Value::CreateStringValue(example_url2_));
+  scoped_ptr<base::ListValue> expected_urls(new base::ListValue);
+  expected_urls->Append(base::Value::CreateStringValue(example_url1_));
+  expected_urls->Append(base::Value::CreateStringValue(example_url2_));
 
   ASSERT_TRUE(HasSyncData(prefs::kURLsToRestoreOnStartup));
   value.reset(GetSyncedValue(prefs::kURLsToRestoreOnStartup));
@@ -620,10 +621,11 @@ TEST_F(ProfileSyncServicePreferenceTest, UpdatedPreferenceWithDefaultValue) {
   ASSERT_TRUE(StartSyncService(create_root.callback(), false));
   ASSERT_TRUE(create_root.success());
 
-  scoped_ptr<Value> expected(Value::CreateStringValue(example_url0_));
+  scoped_ptr<base::Value> expected(
+      base::Value::CreateStringValue(example_url0_));
   profile_->GetPrefs()->Set(prefs::kHomePage, *expected);
 
-  scoped_ptr<const Value> actual(GetSyncedValue(prefs::kHomePage));
+  scoped_ptr<const base::Value> actual(GetSyncedValue(prefs::kHomePage));
   ASSERT_TRUE(actual.get());
   EXPECT_TRUE(expected->Equals(actual.get()));
 }
@@ -634,10 +636,11 @@ TEST_F(ProfileSyncServicePreferenceTest, UpdatedPreferenceWithValue) {
   ASSERT_TRUE(StartSyncService(create_root.callback(), false));
   ASSERT_TRUE(create_root.success());
 
-  scoped_ptr<Value> expected(Value::CreateStringValue(example_url1_));
+  scoped_ptr<base::Value> expected(
+      base::Value::CreateStringValue(example_url1_));
   profile_->GetPrefs()->Set(prefs::kHomePage, *expected);
 
-  scoped_ptr<const Value> actual(GetSyncedValue(prefs::kHomePage));
+  scoped_ptr<const base::Value> actual(GetSyncedValue(prefs::kHomePage));
   ASSERT_TRUE(actual.get());
   EXPECT_TRUE(expected->Equals(actual.get()));
 }
@@ -648,7 +651,8 @@ TEST_F(ProfileSyncServicePreferenceTest, UpdatedSyncNodeActionUpdate) {
   ASSERT_TRUE(StartSyncService(create_root.callback(), false));
   ASSERT_TRUE(create_root.success());
 
-  scoped_ptr<Value> expected(Value::CreateStringValue(example_url1_));
+  scoped_ptr<base::Value> expected(
+      base::Value::CreateStringValue(example_url1_));
   int64 node_id = SetSyncedValue(prefs::kHomePage, *expected);
   ASSERT_NE(node_id, syncer::kInvalidId);
   {
@@ -660,7 +664,7 @@ TEST_F(ProfileSyncServicePreferenceTest, UpdatedSyncNodeActionUpdate) {
   }
   change_processor_->CommitChangesFromSyncModel();
 
-  const Value& actual = GetPreferenceValue(prefs::kHomePage);
+  const base::Value& actual = GetPreferenceValue(prefs::kHomePage);
   EXPECT_TRUE(expected->Equals(&actual));
 }
 
@@ -669,7 +673,8 @@ TEST_F(ProfileSyncServicePreferenceTest, UpdatedSyncNodeActionAdd) {
   ASSERT_TRUE(StartSyncService(create_root.callback(), false));
   ASSERT_TRUE(create_root.success());
 
-  scoped_ptr<Value> expected(Value::CreateStringValue(example_url0_));
+  scoped_ptr<base::Value> expected(
+      base::Value::CreateStringValue(example_url0_));
   int64 node_id = SetSyncedValue(prefs::kHomePage, *expected);
   ASSERT_NE(node_id, syncer::kInvalidId);
   {
@@ -681,7 +686,7 @@ TEST_F(ProfileSyncServicePreferenceTest, UpdatedSyncNodeActionAdd) {
   }
   change_processor_->CommitChangesFromSyncModel();
 
-  const Value& actual = GetPreferenceValue(prefs::kHomePage);
+  const base::Value& actual = GetPreferenceValue(prefs::kHomePage);
   EXPECT_TRUE(expected->Equals(&actual));
   EXPECT_EQ(1U,
       pref_sync_service_->registered_preferences().count(prefs::kHomePage));
@@ -692,7 +697,8 @@ TEST_F(ProfileSyncServicePreferenceTest, UpdatedSyncNodeUnknownPreference) {
   ASSERT_TRUE(StartSyncService(create_root.callback(), false));
   ASSERT_TRUE(create_root.success());
 
-  scoped_ptr<Value> expected(Value::CreateStringValue(example_url0_));
+  scoped_ptr<base::Value> expected(
+      base::Value::CreateStringValue(example_url0_));
   int64 node_id = SetSyncedValue("unknown preference", *expected);
   ASSERT_NE(node_id, syncer::kInvalidId);
   {
@@ -710,8 +716,8 @@ TEST_F(ProfileSyncServicePreferenceTest, UpdatedSyncNodeUnknownPreference) {
 
 TEST_F(ProfileSyncServicePreferenceTest, ManagedPreferences) {
   // Make the homepage preference managed.
-  scoped_ptr<Value> managed_value(
-      Value::CreateStringValue("http://example.com"));
+  scoped_ptr<base::Value> managed_value(
+      base::Value::CreateStringValue("http://example.com"));
   prefs_->SetManagedPref(prefs::kHomePage, managed_value->DeepCopy());
 
   CreateRootHelper create_root(this, syncer::PREFERENCES);
@@ -719,15 +725,15 @@ TEST_F(ProfileSyncServicePreferenceTest, ManagedPreferences) {
   ASSERT_TRUE(create_root.success());
 
   // Changing the homepage preference should not sync anything.
-  scoped_ptr<Value> user_value(
-      Value::CreateStringValue("http://chromium..com"));
+  scoped_ptr<base::Value> user_value(
+      base::Value::CreateStringValue("http://chromium..com"));
   prefs_->SetUserPref(prefs::kHomePage, user_value->DeepCopy());
   EXPECT_EQ(NULL, GetSyncedValue(prefs::kHomePage));
 
   // An incoming sync transaction should change the user value, not the managed
   // value.
-  scoped_ptr<Value> sync_value(
-      Value::CreateStringValue("http://crbug.com"));
+  scoped_ptr<base::Value> sync_value(
+      base::Value::CreateStringValue("http://crbug.com"));
   int64 node_id = SetSyncedValue(prefs::kHomePage, *sync_value);
   ASSERT_NE(node_id, syncer::kInvalidId);
   {
@@ -748,40 +754,40 @@ TEST_F(ProfileSyncServicePreferenceTest, ManagedPreferences) {
 // managed preferences.
 TEST_F(ProfileSyncServicePreferenceTest, ManagedListPreferences) {
   // Make the list of urls to restore on startup managed.
-  ListValue managed_value;
-  managed_value.Append(Value::CreateStringValue(example_url0_));
-  managed_value.Append(Value::CreateStringValue(example_url1_));
+  base::ListValue managed_value;
+  managed_value.Append(base::Value::CreateStringValue(example_url0_));
+  managed_value.Append(base::Value::CreateStringValue(example_url1_));
   prefs_->SetManagedPref(prefs::kURLsToRestoreOnStartup,
                          managed_value.DeepCopy());
 
   // Set a cloud version.
   PreferenceValues cloud_data;
   STLValueDeleter<PreferenceValues> cloud_data_deleter(&cloud_data);
-  ListValue* urls_to_restore = new ListValue;
-  urls_to_restore->Append(Value::CreateStringValue(example_url1_));
-  urls_to_restore->Append(Value::CreateStringValue(example_url2_));
+  base::ListValue* urls_to_restore = new base::ListValue;
+  urls_to_restore->Append(base::Value::CreateStringValue(example_url1_));
+  urls_to_restore->Append(base::Value::CreateStringValue(example_url2_));
   cloud_data[prefs::kURLsToRestoreOnStartup] = urls_to_restore;
 
   // Start sync and verify the synced value didn't get merged.
   AddPreferenceEntriesHelper helper(this, cloud_data);
   ASSERT_TRUE(StartSyncService(helper.callback(), false));
   ASSERT_TRUE(helper.success());
-  scoped_ptr<const Value> actual(
+  scoped_ptr<const base::Value> actual(
       GetSyncedValue(prefs::kURLsToRestoreOnStartup));
   EXPECT_TRUE(cloud_data[prefs::kURLsToRestoreOnStartup]->Equals(actual.get()));
 
   // Changing the user's urls to restore on startup pref should not sync
   // anything.
-  ListValue user_value;
-  user_value.Append(Value::CreateStringValue("http://chromium.org"));
+  base::ListValue user_value;
+  user_value.Append(base::Value::CreateStringValue("http://chromium.org"));
   prefs_->SetUserPref(prefs::kURLsToRestoreOnStartup, user_value.DeepCopy());
   actual.reset(GetSyncedValue(prefs::kURLsToRestoreOnStartup));
   EXPECT_TRUE(cloud_data[prefs::kURLsToRestoreOnStartup]->Equals(actual.get()));
 
   // An incoming sync transaction should change the user value, not the managed
   // value.
-  ListValue sync_value;
-  sync_value.Append(Value::CreateStringValue("http://crbug.com"));
+  base::ListValue sync_value;
+  sync_value.Append(base::Value::CreateStringValue("http://crbug.com"));
   int64 node_id = SetSyncedValue(prefs::kURLsToRestoreOnStartup, sync_value);
   ASSERT_NE(node_id, syncer::kInvalidId);
   {
@@ -804,16 +810,16 @@ TEST_F(ProfileSyncServicePreferenceTest, DynamicManagedPreferences) {
   ASSERT_TRUE(StartSyncService(create_root.callback(), false));
   ASSERT_TRUE(create_root.success());
 
-  scoped_ptr<Value> initial_value(
-      Value::CreateStringValue("http://example.com/initial"));
+  scoped_ptr<base::Value> initial_value(
+      base::Value::CreateStringValue("http://example.com/initial"));
   profile_->GetPrefs()->Set(prefs::kHomePage, *initial_value);
-  scoped_ptr<const Value> actual(GetSyncedValue(prefs::kHomePage));
+  scoped_ptr<const base::Value> actual(GetSyncedValue(prefs::kHomePage));
   ASSERT_TRUE(actual.get());
   EXPECT_TRUE(initial_value->Equals(actual.get()));
 
   // Switch kHomePage to managed and set a different value.
-  scoped_ptr<Value> managed_value(
-      Value::CreateStringValue("http://example.com/managed"));
+  scoped_ptr<base::Value> managed_value(
+      base::Value::CreateStringValue("http://example.com/managed"));
   profile_->GetTestingPrefService()->SetManagedPref(
       prefs::kHomePage, managed_value->DeepCopy());
 
@@ -833,21 +839,21 @@ TEST_F(ProfileSyncServicePreferenceTest,
   ASSERT_TRUE(StartSyncService(create_root.callback(), false));
   ASSERT_TRUE(create_root.success());
 
-  scoped_ptr<Value> initial_value(
-      Value::CreateStringValue("http://example.com/initial"));
+  scoped_ptr<base::Value> initial_value(
+      base::Value::CreateStringValue("http://example.com/initial"));
   profile_->GetPrefs()->Set(prefs::kHomePage, *initial_value);
-  scoped_ptr<const Value> actual(GetSyncedValue(prefs::kHomePage));
+  scoped_ptr<const base::Value> actual(GetSyncedValue(prefs::kHomePage));
   EXPECT_TRUE(initial_value->Equals(actual.get()));
 
   // Switch kHomePage to managed and set a different value.
-  scoped_ptr<Value> managed_value(
-      Value::CreateStringValue("http://example.com/managed"));
+  scoped_ptr<base::Value> managed_value(
+      base::Value::CreateStringValue("http://example.com/managed"));
   profile_->GetTestingPrefService()->SetManagedPref(
       prefs::kHomePage, managed_value->DeepCopy());
 
   // Change the sync value.
-  scoped_ptr<Value> sync_value(
-      Value::CreateStringValue("http://example.com/sync"));
+  scoped_ptr<base::Value> sync_value(
+      base::Value::CreateStringValue("http://example.com/sync"));
   int64 node_id = SetSyncedValue(prefs::kHomePage, *sync_value);
   ASSERT_NE(node_id, syncer::kInvalidId);
   {
@@ -880,8 +886,8 @@ TEST_F(ProfileSyncServicePreferenceTest, DynamicManagedDefaultPreferences) {
   EXPECT_TRUE(pref->IsDefaultValue());
   EXPECT_TRUE(GetSyncedValue(prefs::kHomePage) == NULL);
   // Switch kHomePage to managed and set a different value.
-  scoped_ptr<Value> managed_value(
-      Value::CreateStringValue("http://example.com/managed"));
+  scoped_ptr<base::Value> managed_value(
+      base::Value::CreateStringValue("http://example.com/managed"));
   profile_->GetTestingPrefService()->SetManagedPref(
       prefs::kHomePage, managed_value->DeepCopy());
   // The pref value should be the one dictated by policy.
diff --git a/chrome/browser/sync/profile_sync_service_unittest.cc b/chrome/browser/sync/profile_sync_service_unittest.cc
index 2d37a16..e055ca8 100644
--- a/chrome/browser/sync/profile_sync_service_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_unittest.cc
@@ -189,7 +189,7 @@ TEST_F(ProfileSyncServiceTest, InitialState) {
 TEST_F(ProfileSyncServiceTest, SuccessfulInitialization) {
   profile()->GetTestingPrefService()->SetManagedPref(
       prefs::kSyncManaged,
-      Value::CreateBooleanValue(false));
+      base::Value::CreateBooleanValue(false));
   IssueTestTokens();
   CreateService(ProfileSyncService::AUTO_START);
   ExpectDataTypeManagerCreation();
@@ -221,7 +221,7 @@ TEST_F(ProfileSyncServiceTest, SetupInProgress) {
 TEST_F(ProfileSyncServiceTest, DisabledByPolicyBeforeInit) {
   profile()->GetTestingPrefService()->SetManagedPref(
       prefs::kSyncManaged,
-      Value::CreateBooleanValue(true));
+      base::Value::CreateBooleanValue(true));
   IssueTestTokens();
   CreateService(ProfileSyncService::AUTO_START);
   Initialize();
@@ -243,7 +243,7 @@ TEST_F(ProfileSyncServiceTest, DisabledByPolicyAfterInit) {
 
   profile()->GetTestingPrefService()->SetManagedPref(
       prefs::kSyncManaged,
-      Value::CreateBooleanValue(true));
+      base::Value::CreateBooleanValue(true));
 
   EXPECT_TRUE(service()->IsManaged());
   EXPECT_FALSE(service()->sync_initialized());
diff --git a/chrome/browser/sync/sync_prefs.cc b/chrome/browser/sync/sync_prefs.cc
index 794ee47..ac166ac 100644
--- a/chrome/browser/sync/sync_prefs.cc
+++ b/chrome/browser/sync/sync_prefs.cc
@@ -371,7 +371,7 @@ void SyncPrefs::AcknowledgeSyncedTypes(syncer::ModelTypeSet types) {
             syncer::ModelTypeSetFromValue(
                 *pref_service_->GetList(prefs::kSyncAcknowledgedSyncTypes)));
 
-  scoped_ptr<ListValue> value(
+  scoped_ptr<base::ListValue> value(
       syncer::ModelTypeSetToValue(acknowledged_types));
   pref_service_->Set(prefs::kSyncAcknowledgedSyncTypes, *value);
 }
diff --git a/chrome/browser/sync/test/integration/extension_settings_helper.cc b/chrome/browser/sync/test/integration/extension_settings_helper.cc
index b51d590..f576aba 100644
--- a/chrome/browser/sync/test/integration/extension_settings_helper.cc
+++ b/chrome/browser/sync/test/integration/extension_settings_helper.cc
@@ -28,7 +28,7 @@ namespace extension_settings_helper {
 
 namespace {
 
-std::string ToJson(const Value& value) {
+std::string ToJson(const base::Value& value) {
   std::string json;
   base::JSONWriter::WriteWithOptions(&value,
                                      base::JSONWriter::OPTIONS_PRETTY_PRINT,
@@ -36,7 +36,7 @@ std::string ToJson(const Value& value) {
   return json;
 }
 
-void GetAllSettingsOnFileThread(DictionaryValue* out,
+void GetAllSettingsOnFileThread(base::DictionaryValue* out,
                                 base::WaitableEvent* signal,
                                 ValueStore* storage) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
@@ -44,10 +44,10 @@ void GetAllSettingsOnFileThread(DictionaryValue* out,
   signal->Signal();
 }
 
-scoped_ptr<DictionaryValue> GetAllSettings(
+scoped_ptr<base::DictionaryValue> GetAllSettings(
     Profile* profile, const std::string& id) {
   base::WaitableEvent signal(false, false);
-  scoped_ptr<DictionaryValue> settings(new DictionaryValue());
+  scoped_ptr<base::DictionaryValue> settings(new base::DictionaryValue());
   profile->GetExtensionService()->settings_frontend()->RunWithStorage(
       id,
       extensions::settings_namespace::SYNC,
@@ -69,8 +69,10 @@ bool AreSettingsSame(Profile* expected_profile, Profile* actual_profile) {
   for (extensions::ExtensionSet::const_iterator it = extensions->begin();
       it != extensions->end(); ++it) {
     const std::string& id = (*it)->id();
-    scoped_ptr<DictionaryValue> expected(GetAllSettings(expected_profile, id));
-    scoped_ptr<DictionaryValue> actual(GetAllSettings(actual_profile, id));
+    scoped_ptr<base::DictionaryValue> expected(
+        GetAllSettings(expected_profile, id));
+    scoped_ptr<base::DictionaryValue> actual(
+        GetAllSettings(actual_profile, id));
     if (!expected->Equals(actual.get())) {
       ADD_FAILURE() <<
           "Expected " << ToJson(*expected) << " got " << ToJson(*actual);
@@ -81,7 +83,7 @@ bool AreSettingsSame(Profile* expected_profile, Profile* actual_profile) {
 }
 
 void SetSettingsOnFileThread(
-    const DictionaryValue* settings,
+    const base::DictionaryValue* settings,
     base::WaitableEvent* signal,
     ValueStore* storage) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
@@ -92,7 +94,9 @@ void SetSettingsOnFileThread(
 }  // namespace
 
 void SetExtensionSettings(
-    Profile* profile, const std::string& id, const DictionaryValue& settings) {
+    Profile* profile,
+    const std::string& id,
+    const base::DictionaryValue& settings) {
   base::WaitableEvent signal(false, false);
   profile->GetExtensionService()->settings_frontend()->RunWithStorage(
       id,
@@ -102,7 +106,7 @@ void SetExtensionSettings(
 }
 
 void SetExtensionSettingsForAllProfiles(
-    const std::string& id, const DictionaryValue& settings) {
+    const std::string& id, const base::DictionaryValue& settings) {
   for (int i = 0; i < test()->num_clients(); ++i)
     SetExtensionSettings(test()->GetProfile(i), id, settings);
   SetExtensionSettings(test()->verifier(), id, settings);
diff --git a/chrome/browser/sync/test/integration/multiple_client_preferences_sync_test.cc b/chrome/browser/sync/test/integration/multiple_client_preferences_sync_test.cc
index 601a514..735f65d 100644
--- a/chrome/browser/sync/test/integration/multiple_client_preferences_sync_test.cc
+++ b/chrome/browser/sync/test/integration/multiple_client_preferences_sync_test.cc
@@ -25,8 +25,8 @@ IN_PROC_BROWSER_TEST_F(MultipleClientPreferencesSyncTest, Sanity) {
   DisableVerifier();
 
   for (int i = 0; i < num_clients(); ++i) {
-    ListValue urls;
-    urls.Append(Value::CreateStringValue(
+    base::ListValue urls;
+    urls.Append(base::Value::CreateStringValue(
         base::StringPrintf("http://www.google.com/%d", i)));
     ChangeListPref(i, prefs::kURLsToRestoreOnStartup, urls);
   }
diff --git a/chrome/browser/sync/test/integration/preferences_helper.cc b/chrome/browser/sync/test/integration/preferences_helper.cc
index b456eab..283a733 100644
--- a/chrome/browser/sync/test/integration/preferences_helper.cc
+++ b/chrome/browser/sync/test/integration/preferences_helper.cc
@@ -75,11 +75,11 @@ void ChangeFilePathPref(int index,
 
 void ChangeListPref(int index,
                     const char* pref_name,
-                    const ListValue& new_value) {
+                    const base::ListValue& new_value) {
   {
     ListPrefUpdate update(GetPrefs(index), pref_name);
-    ListValue* list = update.Get();
-    for (ListValue::const_iterator it = new_value.begin();
+    base::ListValue* list = update.Get();
+    for (base::ListValue::const_iterator it = new_value.begin();
          it != new_value.end();
          ++it) {
       list->Append((*it)->DeepCopy());
@@ -88,8 +88,8 @@ void ChangeListPref(int index,
 
   if (test()->use_verifier()) {
     ListPrefUpdate update_verifier(GetVerifierPrefs(), pref_name);
-    ListValue* list_verifier = update_verifier.Get();
-    for (ListValue::const_iterator it = new_value.begin();
+    base::ListValue* list_verifier = update_verifier.Get();
+    for (base::ListValue::const_iterator it = new_value.begin();
          it != new_value.end();
          ++it) {
       list_verifier->Append((*it)->DeepCopy());
@@ -200,7 +200,7 @@ bool FilePathPrefMatches(const char* pref_name) {
 }
 
 bool ListPrefMatches(const char* pref_name) {
-  const ListValue* reference_value;
+  const base::ListValue* reference_value;
   if (test()->use_verifier()) {
     reference_value = GetVerifierPrefs()->GetList(pref_name);
   } else {
diff --git a/chrome/browser/sync/test/integration/preferences_helper.h b/chrome/browser/sync/test/integration/preferences_helper.h
index ac122e6..da3689e7 100644
--- a/chrome/browser/sync/test/integration/preferences_helper.h
+++ b/chrome/browser/sync/test/integration/preferences_helper.h
@@ -67,7 +67,7 @@ void ChangeFilePathPref(int index,
 // |verifier| if DisableVerifier() hasn't been called.
 void ChangeListPref(int index,
                     const char* pref_name,
-                    const ListValue& new_value);
+                    const base::ListValue& new_value);
 
 // Used to verify that the boolean preference with name |pref_name| has the
 // same value across all profiles. Also checks |verifier| if DisableVerifier()
diff --git a/chrome/browser/sync/test/integration/profile_sync_service_harness.cc b/chrome/browser/sync/test/integration/profile_sync_service_harness.cc
index b779956..80478db 100644
--- a/chrome/browser/sync/test/integration/profile_sync_service_harness.cc
+++ b/chrome/browser/sync/test/integration/profile_sync_service_harness.cc
@@ -905,7 +905,7 @@ size_t ProfileSyncServiceHarness::GetNumDatatypes() const {
 }
 
 std::string ProfileSyncServiceHarness::GetServiceStatus() {
-  scoped_ptr<DictionaryValue> value(
+  scoped_ptr<base::DictionaryValue> value(
       sync_ui_util::ConstructAboutInformation(service()));
   std::string service_status;
   base::JSONWriter::WriteWithOptions(value.get(),
diff --git a/chrome/browser/sync/test/integration/sync_extension_helper.cc b/chrome/browser/sync/test/integration/sync_extension_helper.cc
index e9c187c..ec9efb8 100644
--- a/chrome/browser/sync/test/integration/sync_extension_helper.cc
+++ b/chrome/browser/sync/test/integration/sync_extension_helper.cc
@@ -274,7 +274,7 @@ std::string NameToPublicKey(const std::string& name) {
 scoped_refptr<Extension> CreateExtension(const base::FilePath& base_dir,
                                          const std::string& name,
                                          Manifest::Type type) {
-  DictionaryValue source;
+  base::DictionaryValue source;
   source.SetString(extensions::manifest_keys::kName, name);
   const std::string& public_key = NameToPublicKey(name);
   source.SetString(extensions::manifest_keys::kPublicKey, public_key);
@@ -284,19 +284,20 @@ scoped_refptr<Extension> CreateExtension(const base::FilePath& base_dir,
       // Do nothing.
       break;
     case Manifest::TYPE_THEME:
-      source.Set(extensions::manifest_keys::kTheme, new DictionaryValue());
+      source.Set(extensions::manifest_keys::kTheme,
+                 new base::DictionaryValue());
       break;
     case Manifest::TYPE_HOSTED_APP:
     case Manifest::TYPE_LEGACY_PACKAGED_APP:
-      source.Set(extensions::manifest_keys::kApp, new DictionaryValue());
+      source.Set(extensions::manifest_keys::kApp, new base::DictionaryValue());
       source.SetString(extensions::manifest_keys::kLaunchWebURL,
                        "http://www.example.com");
       break;
     case Manifest::TYPE_PLATFORM_APP: {
-      source.Set(extensions::manifest_keys::kApp, new DictionaryValue());
+      source.Set(extensions::manifest_keys::kApp, new base::DictionaryValue());
       source.Set(extensions::manifest_keys::kPlatformAppBackground,
-                 new DictionaryValue());
-      ListValue* scripts = new ListValue();
+                 new base::DictionaryValue());
+      base::ListValue* scripts = new base::ListValue();
       scripts->AppendString("main.js");
       source.Set(extensions::manifest_keys::kPlatformAppBackgroundScripts,
                  scripts);
diff --git a/chrome/browser/sync/test/integration/two_client_extension_settings_and_app_settings_sync_test.cc b/chrome/browser/sync/test/integration/two_client_extension_settings_and_app_settings_sync_test.cc
index daf4bf7..8de4565 100644
--- a/chrome/browser/sync/test/integration/two_client_extension_settings_and_app_settings_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_extension_settings_and_app_settings_sync_test.cc
@@ -30,26 +30,26 @@ void MutateSomeSettings(
     const std::string& extension2) {
   {
     // Write to extension0 from profile 0 but not profile 1.
-    DictionaryValue settings;
+    base::DictionaryValue settings;
     settings.SetString("asdf", base::StringPrintf("asdfasdf-%d", seed));
     SetExtensionSettings(test()->verifier(),    extension0, settings);
     SetExtensionSettings(test()->GetProfile(0), extension0, settings);
   }
   {
     // Write the same data to extension1 from both profiles.
-    DictionaryValue settings;
+    base::DictionaryValue settings;
     settings.SetString("asdf", base::StringPrintf("asdfasdf-%d", seed));
     settings.SetString("qwer", base::StringPrintf("qwerqwer-%d", seed));
     SetExtensionSettingsForAllProfiles(extension1, settings);
   }
   {
     // Write different data to extension2 from each profile.
-    DictionaryValue settings0;
+    base::DictionaryValue settings0;
     settings0.SetString("zxcv", base::StringPrintf("zxcvzxcv-%d", seed));
     SetExtensionSettings(test()->verifier(),    extension2, settings0);
     SetExtensionSettings(test()->GetProfile(0), extension2, settings0);
 
-    DictionaryValue settings1;
+    base::DictionaryValue settings1;
     settings1.SetString("1324", base::StringPrintf("12341234-%d", seed));
     settings1.SetString("5687", base::StringPrintf("56785678-%d", seed));
     SetExtensionSettings(test()->verifier(),    extension2, settings1);
@@ -79,12 +79,12 @@ testing::AssertionResult StartWithSameSettingsTest(
     // Leave extension0 empty.
   }
   {
-    DictionaryValue settings;
+    base::DictionaryValue settings;
     settings.SetString("foo", "bar");
     SetExtensionSettingsForAllProfiles(extension1, settings);
   }
   {
-    DictionaryValue settings;
+    base::DictionaryValue settings;
     settings.SetString("foo", "bar");
     settings.SetString("baz", "qux");
     SetExtensionSettingsForAllProfiles(extension2, settings);
@@ -129,13 +129,13 @@ testing::AssertionResult StartWithDifferentSettingsTest(
     // results, so test (empty, empty).
   }
   {
-    DictionaryValue settings;
+    base::DictionaryValue settings;
     settings.SetString("foo", "bar");
     SetExtensionSettings(test()->verifier(), extension1, settings);
     SetExtensionSettings(test()->GetProfile(0), extension1, settings);
   }
   {
-    DictionaryValue settings;
+    base::DictionaryValue settings;
     settings.SetString("foo", "bar");
     settings.SetString("baz", "qux");
     SetExtensionSettings(test()->verifier(), extension2, settings);
diff --git a/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc b/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc
index 85ade0b..1533b8c1 100644
--- a/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc
@@ -226,9 +226,9 @@ IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(IntegerPrefMatches(prefs::kRestoreOnStartup));
 
-  ListValue urls;
-  urls.Append(Value::CreateStringValue("http://www.google.com/"));
-  urls.Append(Value::CreateStringValue("http://www.flickr.com/"));
+  base::ListValue urls;
+  urls.Append(base::Value::CreateStringValue("http://www.google.com/"));
+  urls.Append(base::Value::CreateStringValue("http://www.flickr.com/"));
   ChangeIntegerPref(0, prefs::kRestoreOnStartup, 4);
   ChangeListPref(0, prefs::kURLsToRestoreOnStartup, urls);
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
diff --git a/chrome/browser/sync_file_system/drive_backend/metadata_database.cc b/chrome/browser/sync_file_system/drive_backend/metadata_database.cc
index 6d903d9..186604a 100644
--- a/chrome/browser/sync_file_system/drive_backend/metadata_database.cc
+++ b/chrome/browser/sync_file_system/drive_backend/metadata_database.cc
@@ -1883,7 +1883,7 @@ scoped_ptr<base::ListValue> MetadataDatabase::DumpFiles(
         trackers_by_parent_and_title_, tracker_id, std::back_inserter(stack));
 
     FileTracker* tracker = tracker_by_id_[tracker_id];
-    base::DictionaryValue* file = new DictionaryValue;
+    base::DictionaryValue* file = new base::DictionaryValue;
 
     base::FilePath path = BuildDisplayPathForTracker(*tracker);
     file->SetString("path", path.AsUTF8Unsafe());
@@ -1893,7 +1893,7 @@ scoped_ptr<base::ListValue> MetadataDatabase::DumpFiles(
                       FileKindToString(tracker->synced_details().file_kind()));
     }
 
-    base::DictionaryValue* details = new DictionaryValue;
+    base::DictionaryValue* details = new base::DictionaryValue;
     details->SetString("file_id", tracker->file_id());
     if (tracker->has_synced_details() &&
         tracker->synced_details().file_kind() == FILE_KIND_FILE)
@@ -1929,7 +1929,7 @@ scoped_ptr<base::ListValue> MetadataDatabase::DumpTrackers() {
   scoped_ptr<base::ListValue> trackers(new base::ListValue);
 
   // Append the first element for metadata.
-  base::DictionaryValue* metadata = new DictionaryValue;
+  base::DictionaryValue* metadata = new base::DictionaryValue;
   const char *trackerKeys[] = {
     "tracker_id", "path", "file_id", "tracker_kind", "app_id",
     "active", "dirty", "folder_listing",
@@ -1937,7 +1937,7 @@ scoped_ptr<base::ListValue> MetadataDatabase::DumpTrackers() {
   };
   std::vector<std::string> key_strings(
       trackerKeys, trackerKeys + ARRAYSIZE_UNSAFE(trackerKeys));
-  base::ListValue* keys = new ListValue;
+  base::ListValue* keys = new base::ListValue;
   keys->AppendStrings(key_strings);
   metadata->SetString("title", "Trackers");
   metadata->Set("keys", keys);
@@ -1947,7 +1947,7 @@ scoped_ptr<base::ListValue> MetadataDatabase::DumpTrackers() {
   for (TrackerByID::const_iterator itr = tracker_by_id_.begin();
        itr != tracker_by_id_.end(); ++itr) {
     const FileTracker& tracker = *itr->second;
-    base::DictionaryValue* dict = new DictionaryValue;
+    base::DictionaryValue* dict = new base::DictionaryValue;
     base::FilePath path = BuildDisplayPathForTracker(tracker);
     dict->SetString("tracker_id", base::Int64ToString(tracker.tracker_id()));
     dict->SetString("path", path.AsUTF8Unsafe());
@@ -1982,14 +1982,14 @@ scoped_ptr<base::ListValue> MetadataDatabase::DumpMetadata() {
   scoped_ptr<base::ListValue> files(new base::ListValue);
 
   // Append the first element for metadata.
-  base::DictionaryValue* metadata = new DictionaryValue;
+  base::DictionaryValue* metadata = new base::DictionaryValue;
   const char *fileKeys[] = {
     "file_id", "title", "type", "md5", "etag", "missing",
     "change_id", "parents"
   };
   std::vector<std::string> key_strings(
       fileKeys, fileKeys + ARRAYSIZE_UNSAFE(fileKeys));
-  base::ListValue* keys = new ListValue;
+  base::ListValue* keys = new base::ListValue;
   keys->AppendStrings(key_strings);
   metadata->SetString("title", "Metadata");
   metadata->Set("keys", keys);
@@ -2000,7 +2000,7 @@ scoped_ptr<base::ListValue> MetadataDatabase::DumpMetadata() {
        itr != file_by_id_.end(); ++itr) {
     const FileMetadata& file = *itr->second;
 
-    base::DictionaryValue* dict = new DictionaryValue;
+    base::DictionaryValue* dict = new base::DictionaryValue;
     dict->SetString("file_id", file.file_id());
     if (file.has_details()) {
       const FileDetails& details = file.details();
diff --git a/chrome/browser/sync_file_system/drive_backend_v1/drive_metadata_store.cc b/chrome/browser/sync_file_system/drive_backend_v1/drive_metadata_store.cc
index 6b643bf..a0fdb63 100644
--- a/chrome/browser/sync_file_system/drive_backend_v1/drive_metadata_store.cc
+++ b/chrome/browser/sync_file_system/drive_backend_v1/drive_metadata_store.cc
@@ -781,12 +781,12 @@ scoped_ptr<base::ListValue> DriveMetadataStore::DumpFiles(const GURL& origin) {
     // Convert Drive specific metadata to Common File metadata object.
     const DriveMetadata& metadata = itr->second;
 
-    base::DictionaryValue* file = new DictionaryValue;
+    base::DictionaryValue* file = new base::DictionaryValue;
     file->SetString("path", itr->first.AsUTF8Unsafe());
     file->SetString("title", itr->first.BaseName().AsUTF8Unsafe());
     file->SetString("type", DriveTypeToString(metadata.type()));
 
-    base::DictionaryValue* details = new DictionaryValue;
+    base::DictionaryValue* details = new base::DictionaryValue;
     details->SetString("resource_id", metadata.resource_id());
     details->SetString("md5", metadata.md5_checksum());
     details->SetString("dirty", metadata.to_be_fetched() ? "true" : "false");
diff --git a/chrome/browser/task_profiler/task_profiler_data_serializer.cc b/chrome/browser/task_profiler/task_profiler_data_serializer.cc
index 8e93744..8dc34f5 100644
--- a/chrome/browser/task_profiler/task_profiler_data_serializer.cc
+++ b/chrome/browser/task_profiler/task_profiler_data_serializer.cc
@@ -27,49 +27,54 @@ namespace {
 
 // Re-serializes the |location| into |dictionary|.
 void LocationSnapshotToValue(const LocationSnapshot& location,
-                             DictionaryValue* dictionary) {
-  dictionary->Set("file_name", Value::CreateStringValue(location.file_name));
+                             base::DictionaryValue* dictionary) {
+  dictionary->Set("file_name",
+                  base::Value::CreateStringValue(location.file_name));
   // Note: This function name is not escaped, and templates have less-than
   // characters, which means this is not suitable for display as HTML unless
   // properly escaped.
   dictionary->Set("function_name",
-                  Value::CreateStringValue(location.function_name));
+                  base::Value::CreateStringValue(location.function_name));
   dictionary->Set("line_number",
-                  Value::CreateIntegerValue(location.line_number));
+                  base::Value::CreateIntegerValue(location.line_number));
 }
 
 // Re-serializes the |birth| into |dictionary|.  Prepends the |prefix| to the
 // "thread" and "location" key names in the dictionary.
 void BirthOnThreadSnapshotToValue(const BirthOnThreadSnapshot& birth,
                                   const std::string& prefix,
-                                  DictionaryValue* dictionary) {
+                                  base::DictionaryValue* dictionary) {
   DCHECK(!prefix.empty());
 
-  scoped_ptr<DictionaryValue> location_value(new DictionaryValue);
+  scoped_ptr<base::DictionaryValue> location_value(new base::DictionaryValue);
   LocationSnapshotToValue(birth.location, location_value.get());
   dictionary->Set(prefix + "_location", location_value.release());
 
   dictionary->Set(prefix + "_thread",
-                  Value::CreateStringValue(birth.thread_name));
+                  base::Value::CreateStringValue(birth.thread_name));
 }
 
 // Re-serializes the |death_data| into |dictionary|.
 void DeathDataSnapshotToValue(const DeathDataSnapshot& death_data,
                               base::DictionaryValue* dictionary) {
   dictionary->Set("count",
-                  Value::CreateIntegerValue(death_data.count));
+                  base::Value::CreateIntegerValue(death_data.count));
   dictionary->Set("run_ms",
-                  Value::CreateIntegerValue(death_data.run_duration_sum));
+                  base::Value::CreateIntegerValue(death_data.run_duration_sum));
   dictionary->Set("run_ms_max",
-                  Value::CreateIntegerValue(death_data.run_duration_max));
+                  base::Value::CreateIntegerValue(death_data.run_duration_max));
   dictionary->Set("run_ms_sample",
-                  Value::CreateIntegerValue(death_data.run_duration_sample));
+                  base::Value::CreateIntegerValue(
+                      death_data.run_duration_sample));
   dictionary->Set("queue_ms",
-                  Value::CreateIntegerValue(death_data.queue_duration_sum));
+                  base::Value::CreateIntegerValue(
+                      death_data.queue_duration_sum));
   dictionary->Set("queue_ms_max",
-                  Value::CreateIntegerValue(death_data.queue_duration_max));
+                  base::Value::CreateIntegerValue(
+                      death_data.queue_duration_max));
   dictionary->Set("queue_ms_sample",
-                  Value::CreateIntegerValue(death_data.queue_duration_sample));
+                  base::Value::CreateIntegerValue(
+                      death_data.queue_duration_sample));
 
 }
 
@@ -78,12 +83,12 @@ void TaskSnapshotToValue(const TaskSnapshot& snapshot,
                          base::DictionaryValue* dictionary) {
   BirthOnThreadSnapshotToValue(snapshot.birth, "birth", dictionary);
 
-  scoped_ptr<DictionaryValue> death_data(new DictionaryValue);
+  scoped_ptr<base::DictionaryValue> death_data(new base::DictionaryValue);
   DeathDataSnapshotToValue(snapshot.death_data, death_data.get());
   dictionary->Set("death_data", death_data.release());
 
   dictionary->Set("death_thread",
-                  Value::CreateStringValue(snapshot.death_thread_name));
+                  base::Value::CreateStringValue(snapshot.death_thread_name));
 
 }
 
@@ -100,7 +105,7 @@ void TaskProfilerDataSerializer::ToValue(
   for (std::vector<TaskSnapshot>::const_iterator it =
            process_data.tasks.begin();
        it != process_data.tasks.end(); ++it) {
-    scoped_ptr<DictionaryValue> snapshot(new DictionaryValue);
+    scoped_ptr<base::DictionaryValue> snapshot(new base::DictionaryValue);
     TaskSnapshotToValue(*it, snapshot.get());
     tasks_list->Append(snapshot.release());
   }
@@ -128,11 +133,11 @@ bool TaskProfilerDataSerializer::WriteToFile(const base::FilePath& path) {
   JSONStringValueSerializer serializer(&output);
   serializer.set_pretty_print(true);
 
-  scoped_ptr<base::DictionaryValue> root(new DictionaryValue());
+  scoped_ptr<base::DictionaryValue> root(new base::DictionaryValue());
 
-  base::ListValue* snapshot_list = new ListValue();
-  base::DictionaryValue* shutdown_snapshot = new DictionaryValue();
-  base::ListValue* per_process_data = new ListValue();
+  base::ListValue* snapshot_list = new base::ListValue();
+  base::DictionaryValue* shutdown_snapshot = new base::DictionaryValue();
+  base::ListValue* per_process_data = new base::ListValue();
 
   root->SetInteger("version", 1);
   root->SetString("userAgent", content::GetUserAgent(GURL()));
diff --git a/chrome/browser/themes/browser_theme_pack.cc b/chrome/browser/themes/browser_theme_pack.cc
index 2fdec03..0750d64 100644
--- a/chrome/browser/themes/browser_theme_pack.cc
+++ b/chrome/browser/themes/browser_theme_pack.cc
@@ -965,9 +965,9 @@ void BrowserThemePack::BuildTintsFromJSON(
 
   // Parse the incoming data from |tints_value| into an intermediary structure.
   std::map<int, color_utils::HSL> temp_tints;
-  for (DictionaryValue::Iterator iter(*tints_value); !iter.IsAtEnd();
+  for (base::DictionaryValue::Iterator iter(*tints_value); !iter.IsAtEnd();
        iter.Advance()) {
-    const ListValue* tint_list;
+    const base::ListValue* tint_list;
     if (iter.value().GetAsList(&tint_list) &&
         (tint_list->GetSize() == 3)) {
       color_utils::HSL hsl = { -1, -1, -1 };
@@ -1022,9 +1022,9 @@ void BrowserThemePack::ReadColorsFromJSON(
     const base::DictionaryValue* colors_value,
     std::map<int, SkColor>* temp_colors) {
   // Parse the incoming data from |colors_value| into an intermediary structure.
-  for (DictionaryValue::Iterator iter(*colors_value); !iter.IsAtEnd();
+  for (base::DictionaryValue::Iterator iter(*colors_value); !iter.IsAtEnd();
        iter.Advance()) {
-    const ListValue* color_list;
+    const base::ListValue* color_list;
     if (iter.value().GetAsList(&color_list) &&
         ((color_list->GetSize() == 3) || (color_list->GetSize() == 4))) {
       SkColor color = SK_ColorWHITE;
@@ -1125,7 +1125,7 @@ void BrowserThemePack::BuildDisplayPropertiesFromJSON(
     return;
 
   std::map<int, int> temp_properties;
-  for (DictionaryValue::Iterator iter(*display_properties_value);
+  for (base::DictionaryValue::Iterator iter(*display_properties_value);
        !iter.IsAtEnd(); iter.Advance()) {
     int property_id = GetIntForString(iter.key(), kDisplayProperties,
                                       kDisplayPropertiesSize);
@@ -1172,18 +1172,18 @@ void BrowserThemePack::ParseImageNamesFromJSON(
   if (!images_value)
     return;
 
-  for (DictionaryValue::Iterator iter(*images_value); !iter.IsAtEnd();
+  for (base::DictionaryValue::Iterator iter(*images_value); !iter.IsAtEnd();
        iter.Advance()) {
-    if (iter.value().IsType(Value::TYPE_DICTIONARY)) {
-      const DictionaryValue* inner_value = NULL;
+    if (iter.value().IsType(base::Value::TYPE_DICTIONARY)) {
+      const base::DictionaryValue* inner_value = NULL;
       if (iter.value().GetAsDictionary(&inner_value)) {
-        for (DictionaryValue::Iterator inner_iter(*inner_value);
+        for (base::DictionaryValue::Iterator inner_iter(*inner_value);
              !inner_iter.IsAtEnd();
              inner_iter.Advance()) {
           std::string name;
           ui::ScaleFactor scale_factor = ui::SCALE_FACTOR_NONE;
           if (GetScaleFactorFromManifestKey(inner_iter.key(), &scale_factor) &&
-              inner_iter.value().IsType(Value::TYPE_STRING) &&
+              inner_iter.value().IsType(base::Value::TYPE_STRING) &&
               inner_iter.value().GetAsString(&name)) {
             AddFileAtScaleToMap(iter.key(),
                                 scale_factor,
@@ -1192,7 +1192,7 @@ void BrowserThemePack::ParseImageNamesFromJSON(
           }
         }
       }
-    } else if (iter.value().IsType(Value::TYPE_STRING)) {
+    } else if (iter.value().IsType(base::Value::TYPE_STRING)) {
       std::string name;
       if (iter.value().GetAsString(&name)) {
         AddFileAtScaleToMap(iter.key(),
diff --git a/chrome/browser/themes/browser_theme_pack_unittest.cc b/chrome/browser/themes/browser_theme_pack_unittest.cc
index 7d41e55..62797ce 100644
--- a/chrome/browser/themes/browser_theme_pack_unittest.cc
+++ b/chrome/browser/themes/browser_theme_pack_unittest.cc
@@ -94,45 +94,46 @@ class BrowserThemePackTest : public ::testing::Test {
   }
 
   void LoadColorJSON(const std::string& json) {
-    scoped_ptr<Value> value(base::JSONReader::Read(json));
-    ASSERT_TRUE(value->IsType(Value::TYPE_DICTIONARY));
-    LoadColorDictionary(static_cast<DictionaryValue*>(value.get()));
+    scoped_ptr<base::Value> value(base::JSONReader::Read(json));
+    ASSERT_TRUE(value->IsType(base::Value::TYPE_DICTIONARY));
+    LoadColorDictionary(static_cast<base::DictionaryValue*>(value.get()));
   }
 
-  void LoadColorDictionary(DictionaryValue* value) {
+  void LoadColorDictionary(base::DictionaryValue* value) {
     theme_pack_->BuildColorsFromJSON(value);
   }
 
   void LoadTintJSON(const std::string& json) {
-    scoped_ptr<Value> value(base::JSONReader::Read(json));
-    ASSERT_TRUE(value->IsType(Value::TYPE_DICTIONARY));
-    LoadTintDictionary(static_cast<DictionaryValue*>(value.get()));
+    scoped_ptr<base::Value> value(base::JSONReader::Read(json));
+    ASSERT_TRUE(value->IsType(base::Value::TYPE_DICTIONARY));
+    LoadTintDictionary(static_cast<base::DictionaryValue*>(value.get()));
   }
 
-  void LoadTintDictionary(DictionaryValue* value) {
+  void LoadTintDictionary(base::DictionaryValue* value) {
     theme_pack_->BuildTintsFromJSON(value);
   }
 
   void LoadDisplayPropertiesJSON(const std::string& json) {
-    scoped_ptr<Value> value(base::JSONReader::Read(json));
-    ASSERT_TRUE(value->IsType(Value::TYPE_DICTIONARY));
-    LoadDisplayPropertiesDictionary(static_cast<DictionaryValue*>(value.get()));
+    scoped_ptr<base::Value> value(base::JSONReader::Read(json));
+    ASSERT_TRUE(value->IsType(base::Value::TYPE_DICTIONARY));
+    LoadDisplayPropertiesDictionary(
+        static_cast<base::DictionaryValue*>(value.get()));
   }
 
-  void LoadDisplayPropertiesDictionary(DictionaryValue* value) {
+  void LoadDisplayPropertiesDictionary(base::DictionaryValue* value) {
     theme_pack_->BuildDisplayPropertiesFromJSON(value);
   }
 
   void ParseImageNamesJSON(const std::string& json,
                            TestFilePathMap* out_file_paths) {
-    scoped_ptr<Value> value(base::JSONReader::Read(json));
-    ASSERT_TRUE(value->IsType(Value::TYPE_DICTIONARY));
-    ParseImageNamesDictionary(static_cast<DictionaryValue*>(value.get()),
+    scoped_ptr<base::Value> value(base::JSONReader::Read(json));
+    ASSERT_TRUE(value->IsType(base::Value::TYPE_DICTIONARY));
+    ParseImageNamesDictionary(static_cast<base::DictionaryValue*>(value.get()),
                               out_file_paths);
   }
 
   void ParseImageNamesDictionary(
-      DictionaryValue* value,
+      base::DictionaryValue* value,
       TestFilePathMap* out_file_paths) {
     theme_pack_->ParseImageNamesFromJSON(value, base::FilePath(),
                                          out_file_paths);
@@ -154,8 +155,9 @@ class BrowserThemePackTest : public ::testing::Test {
         extension_path.AppendASCII("manifest.json");
     std::string error;
     JSONFileValueSerializer serializer(manifest_path);
-    scoped_ptr<DictionaryValue> valid_value(
-        static_cast<DictionaryValue*>(serializer.Deserialize(NULL, &error)));
+    scoped_ptr<base::DictionaryValue> valid_value(
+        static_cast<base::DictionaryValue*>(
+            serializer.Deserialize(NULL, &error)));
     EXPECT_EQ("", error);
     ASSERT_TRUE(valid_value.get());
     scoped_refptr<Extension> extension(
diff --git a/chrome/browser/themes/theme_syncable_service_unittest.cc b/chrome/browser/themes/theme_syncable_service_unittest.cc
index 41532c3..c1af3fb 100644
--- a/chrome/browser/themes/theme_syncable_service_unittest.cc
+++ b/chrome/browser/themes/theme_syncable_service_unittest.cc
@@ -148,9 +148,9 @@ scoped_refptr<extensions::Extension> MakeThemeExtension(
     const string& name,
     extensions::Manifest::Location location,
     const string& update_url) {
-  DictionaryValue source;
+  base::DictionaryValue source;
   source.SetString(extensions::manifest_keys::kName, name);
-  source.Set(extensions::manifest_keys::kTheme, new DictionaryValue());
+  source.Set(extensions::manifest_keys::kTheme, new base::DictionaryValue());
   source.SetString(extensions::manifest_keys::kUpdateURL, update_url);
   source.SetString(extensions::manifest_keys::kVersion, "0.0.0.0");
   string error;
diff --git a/chrome/browser/translate/translate_language_list.cc b/chrome/browser/translate/translate_language_list.cc
index bc705c8..64b0f3b 100644
--- a/chrome/browser/translate/translate_language_list.cc
+++ b/chrome/browser/translate/translate_language_list.cc
@@ -148,18 +148,18 @@ void SetSupportedLanguages(const std::string& language_list,
   std::string languages_json = language_list.substr(
       kLanguageListCallbackNameLength,
       language_list.size() - kLanguageListCallbackNameLength - 1);
-  scoped_ptr<Value> json_value(
+  scoped_ptr<base::Value> json_value(
       base::JSONReader::Read(languages_json, base::JSON_ALLOW_TRAILING_COMMAS));
-  if (json_value == NULL || !json_value->IsType(Value::TYPE_DICTIONARY)) {
+  if (json_value == NULL || !json_value->IsType(base::Value::TYPE_DICTIONARY)) {
     NOTREACHED();
     return;
   }
   // The first level dictionary contains three sub-dict, first for source
   // languages and second for target languages, we want to use the target
   // languages. The last is for alpha languages.
-  DictionaryValue* language_dict =
-      static_cast<DictionaryValue*>(json_value.get());
-  DictionaryValue* target_languages = NULL;
+  base::DictionaryValue* language_dict =
+      static_cast<base::DictionaryValue*>(json_value.get());
+  base::DictionaryValue* target_languages = NULL;
   if (!language_dict->GetDictionary(TranslateLanguageList::kTargetLanguagesKey,
                                     &target_languages) ||
       target_languages == NULL) {
@@ -173,7 +173,7 @@ void SetSupportedLanguages(const std::string& language_list,
   target_language_set->clear();
   std::string message;
   // ... and replace it with the values we just fetched from the server.
-  for (DictionaryValue::Iterator iter(*target_languages);
+  for (base::DictionaryValue::Iterator iter(*target_languages);
        !iter.IsAtEnd();
        iter.Advance()) {
     const std::string& lang = iter.key();
@@ -190,7 +190,7 @@ void SetSupportedLanguages(const std::string& language_list,
   NotifyEvent(__LINE__, message);
 
   // Get the alpha languages. The "al" parameter could be abandoned.
-  DictionaryValue* alpha_languages = NULL;
+  base::DictionaryValue* alpha_languages = NULL;
   if (!language_dict->GetDictionary(TranslateLanguageList::kAlphaLanguagesKey,
                                     &alpha_languages) ||
       alpha_languages == NULL) {
@@ -200,7 +200,7 @@ void SetSupportedLanguages(const std::string& language_list,
   // We assume that the alpha languages are included in the above target
   // languages, and don't use UMA or NotifyEvent.
   alpha_language_set->clear();
-  for (DictionaryValue::Iterator iter(*alpha_languages);
+  for (base::DictionaryValue::Iterator iter(*alpha_languages);
        !iter.IsAtEnd(); iter.Advance()) {
     const std::string& lang = iter.key();
     if (!l10n_util::IsLocaleNameTranslated(lang.c_str(), locale))
diff --git a/chrome/browser/translate/translate_prefs.cc b/chrome/browser/translate/translate_prefs.cc
index cbae43c..429798a 100644
--- a/chrome/browser/translate/translate_prefs.cc
+++ b/chrome/browser/translate/translate_prefs.cc
@@ -39,8 +39,9 @@ void GetBlacklistedLanguages(const PrefService* prefs,
   DCHECK(languages->empty());
 
   const char* key = TranslatePrefs::kPrefTranslateLanguageBlacklist;
-  const ListValue* list = prefs->GetList(key);
-  for (ListValue::const_iterator it = list->begin(); it != list->end(); ++it) {
+  const base::ListValue* list = prefs->GetList(key);
+  for (base::ListValue::const_iterator it = list->begin();
+       it != list->end(); ++it) {
     std::string lang;
     (*it)->GetAsString(&lang);
     languages->push_back(lang);
@@ -150,7 +151,8 @@ void TranslatePrefs::RemoveSiteFromBlacklist(const std::string& site) {
 bool TranslatePrefs::IsLanguagePairWhitelisted(
     const std::string& original_language,
     const std::string& target_language) {
-  const DictionaryValue* dict = prefs_->GetDictionary(kPrefTranslateWhitelists);
+  const base::DictionaryValue* dict =
+      prefs_->GetDictionary(kPrefTranslateWhitelists);
   if (dict && !dict->empty()) {
     std::string auto_target_lang;
     if (dict->GetString(original_language, &auto_target_lang) &&
@@ -164,7 +166,7 @@ void TranslatePrefs::WhitelistLanguagePair(
     const std::string& original_language,
     const std::string& target_language) {
   DictionaryPrefUpdate update(prefs_, kPrefTranslateWhitelists);
-  DictionaryValue* dict = update.Get();
+  base::DictionaryValue* dict = update.Get();
   if (!dict) {
     NOTREACHED() << "Unregistered translate whitelist pref";
     return;
@@ -176,7 +178,7 @@ void TranslatePrefs::RemoveLanguagePairFromWhitelist(
     const std::string& original_language,
     const std::string& target_language) {
   DictionaryPrefUpdate update(prefs_, kPrefTranslateWhitelists);
-  DictionaryValue* dict = update.Get();
+  base::DictionaryValue* dict = update.Get();
   if (!dict) {
     NOTREACHED() << "Unregistered translate whitelist pref";
     return;
@@ -210,7 +212,7 @@ void TranslatePrefs::ClearWhitelistedLanguagePairs() {
 
 int TranslatePrefs::GetTranslationDeniedCount(
     const std::string& language) const {
-  const DictionaryValue* dict =
+  const base::DictionaryValue* dict =
       prefs_->GetDictionary(kPrefTranslateDeniedCount);
   int count = 0;
   return dict->GetInteger(language, &count) ? count : 0;
@@ -219,7 +221,7 @@ int TranslatePrefs::GetTranslationDeniedCount(
 void TranslatePrefs::IncrementTranslationDeniedCount(
     const std::string& language) {
   DictionaryPrefUpdate update(prefs_, kPrefTranslateDeniedCount);
-  DictionaryValue* dict = update.Get();
+  base::DictionaryValue* dict = update.Get();
 
   int count = 0;
   dict->GetInteger(language, &count);
@@ -232,7 +234,7 @@ void TranslatePrefs::ResetTranslationDeniedCount(const std::string& language) {
 }
 
 int TranslatePrefs::GetTranslationAcceptedCount(const std::string& language) {
-  const DictionaryValue* dict =
+  const base::DictionaryValue* dict =
       prefs_->GetDictionary(kPrefTranslateAcceptedCount);
   int count = 0;
   return dict->GetInteger(language, &count) ? count : 0;
@@ -241,7 +243,7 @@ int TranslatePrefs::GetTranslationAcceptedCount(const std::string& language) {
 void TranslatePrefs::IncrementTranslationAcceptedCount(
     const std::string& language) {
   DictionaryPrefUpdate update(prefs_, kPrefTranslateAcceptedCount);
-  DictionaryValue* dict = update.Get();
+  base::DictionaryValue* dict = update.Get();
   int count = 0;
   dict->GetInteger(language, &count);
   dict->SetInteger(language, count + 1);
@@ -353,11 +355,11 @@ void TranslatePrefs::MigrateUserPrefs(PrefService* user_prefs) {
   //   assuming the last (i.e. most recent) target lang is what user wants to
   //   keep auto-translated.
   DictionaryPrefUpdate update(user_prefs, kPrefTranslateWhitelists);
-  DictionaryValue* dict = update.Get();
+  base::DictionaryValue* dict = update.Get();
   if (dict && !dict->empty()) {
-    DictionaryValue::Iterator iter(*dict);
+    base::DictionaryValue::Iterator iter(*dict);
     while (!iter.IsAtEnd()) {
-      const ListValue* list = NULL;
+      const base::ListValue* list = NULL;
       if (!iter.value().GetAsList(&list) || !list)
         break;  // Dictionary has either been migrated or new format.
       std::string key = iter.key();
@@ -399,14 +401,14 @@ void TranslatePrefs::MigrateUserPrefs(PrefService* user_prefs) {
 
     // Create the new preference kPrefTranslateBlockedLanguages.
     {
-      ListValue blocked_languages_list;
+      base::ListValue blocked_languages_list;
       for (std::vector<std::string>::const_iterator it =
                blocked_languages.begin();
            it != blocked_languages.end(); ++it) {
-        blocked_languages_list.Append(new StringValue(*it));
+        blocked_languages_list.Append(new base::StringValue(*it));
       }
       ListPrefUpdate update(user_prefs, kPrefTranslateBlockedLanguages);
-      ListValue* list = update.Get();
+      base::ListValue* list = update.Get();
       DCHECK(list != NULL);
       list->Swap(&blocked_languages_list);
     }
@@ -484,7 +486,7 @@ std::string TranslatePrefs::ConvertLangCodeForTranslation(
   return main_part;
 }
 
-bool TranslatePrefs::IsValueInList(const ListValue* list,
+bool TranslatePrefs::IsValueInList(const base::ListValue* list,
     const std::string& in_value) const {
   for (size_t i = 0; i < list->GetSize(); ++i) {
     std::string value;
@@ -496,7 +498,7 @@ bool TranslatePrefs::IsValueInList(const ListValue* list,
 
 bool TranslatePrefs::IsValueBlacklisted(const char* pref_id,
     const std::string& value) const {
-  const ListValue* blacklist = prefs_->GetList(pref_id);
+  const base::ListValue* blacklist = prefs_->GetList(pref_id);
   return (blacklist && !blacklist->empty() && IsValueInList(blacklist, value));
 }
 
@@ -504,30 +506,31 @@ void TranslatePrefs::BlacklistValue(const char* pref_id,
     const std::string& value) {
   {
     ListPrefUpdate update(prefs_, pref_id);
-    ListValue* blacklist = update.Get();
+    base::ListValue* blacklist = update.Get();
     if (!blacklist) {
       NOTREACHED() << "Unregistered translate blacklist pref";
       return;
     }
-    blacklist->Append(new StringValue(value));
+    blacklist->Append(new base::StringValue(value));
   }
 }
 
 void TranslatePrefs::RemoveValueFromBlacklist(const char* pref_id,
     const std::string& value) {
   ListPrefUpdate update(prefs_, pref_id);
-  ListValue* blacklist = update.Get();
+  base::ListValue* blacklist = update.Get();
   if (!blacklist) {
     NOTREACHED() << "Unregistered translate blacklist pref";
     return;
   }
-  StringValue string_value(value);
+  base::StringValue string_value(value);
   blacklist->Remove(string_value, NULL);
 }
 
 bool TranslatePrefs::IsLanguageWhitelisted(
     const std::string& original_language, std::string* target_language) const {
-  const DictionaryValue* dict = prefs_->GetDictionary(kPrefTranslateWhitelists);
+  const base::DictionaryValue* dict =
+      prefs_->GetDictionary(kPrefTranslateWhitelists);
   if (dict && dict->GetString(original_language, target_language)) {
     DCHECK(!target_language->empty());
     return !target_language->empty();
@@ -536,11 +539,11 @@ bool TranslatePrefs::IsLanguageWhitelisted(
 }
 
 bool TranslatePrefs::IsListEmpty(const char* pref_id) const {
-  const ListValue* blacklist = prefs_->GetList(pref_id);
+  const base::ListValue* blacklist = prefs_->GetList(pref_id);
   return (blacklist == NULL || blacklist->empty());
 }
 
 bool TranslatePrefs::IsDictionaryEmpty(const char* pref_id) const {
-  const DictionaryValue* dict = prefs_->GetDictionary(pref_id);
+  const base::DictionaryValue* dict = prefs_->GetDictionary(pref_id);
   return (dict == NULL || dict->empty());
 }
diff --git a/chrome/browser/ui/app_list/extension_app_model_builder_unittest.cc b/chrome/browser/ui/app_list/extension_app_model_builder_unittest.cc
index 597f684..0a63a65 100644
--- a/chrome/browser/ui/app_list/extension_app_model_builder_unittest.cc
+++ b/chrome/browser/ui/app_list/extension_app_model_builder_unittest.cc
@@ -47,7 +47,7 @@ scoped_refptr<extensions::Extension> MakeApp(const std::string& name,
                                              const std::string& url,
                                              const std::string& id) {
   std::string err;
-  DictionaryValue value;
+  base::DictionaryValue value;
   value.SetString("name", name);
   value.SetString("version", version);
   value.SetString("app.launch.web_url", url);
diff --git a/chrome/browser/ui/app_list/search/common/webservice_cache.cc b/chrome/browser/ui/app_list/search/common/webservice_cache.cc
index ff0e15f..7835301 100644
--- a/chrome/browser/ui/app_list/search/common/webservice_cache.cc
+++ b/chrome/browser/ui/app_list/search/common/webservice_cache.cc
@@ -80,7 +80,7 @@ void WebserviceCache::OnCacheLoaded(scoped_ptr<base::DictionaryValue>) {
     return;
 
   std::vector<std::string> cleanup_keys;
-  for (DictionaryValue::Iterator it(*data_store_->cached_dict());
+  for (base::DictionaryValue::Iterator it(*data_store_->cached_dict());
       !it.IsAtEnd();
       it.Advance()) {
     const base::DictionaryValue* payload_dict;
diff --git a/chrome/browser/ui/app_list/search/people/people_provider.cc b/chrome/browser/ui/app_list/search/people/people_provider.cc
index 545b9e5..b5a4793 100644
--- a/chrome/browser/ui/app_list/search/people/people_provider.cc
+++ b/chrome/browser/ui/app_list/search/people/people_provider.cc
@@ -162,7 +162,7 @@ void PeopleProvider::ProcessPeopleSearchResults(
   }
 
   ClearResults();
-  for (ListValue::const_iterator it = item_list->begin();
+  for (base::ListValue::const_iterator it = item_list->begin();
        it != item_list->end();
        ++it) {
     const base::DictionaryValue* dict;
diff --git a/chrome/browser/ui/app_list/search/people/person.cc b/chrome/browser/ui/app_list/search/people/person.cc
index eb19164..3e2a7de 100644
--- a/chrome/browser/ui/app_list/search/people/person.cc
+++ b/chrome/browser/ui/app_list/search/people/person.cc
@@ -43,7 +43,7 @@ std::string GetTargetValue(const base::DictionaryValue& dict,
   if (!dict.GetList(list_key, &list) || !list)
     return std::string();
 
-  ListValue::const_iterator it = list->begin();
+  base::ListValue::const_iterator it = list->begin();
   if (it == list->end())
     return std::string();
 
diff --git a/chrome/browser/ui/app_list/search/webstore/webstore_provider.cc b/chrome/browser/ui/app_list/search/webstore/webstore_provider.cc
index b22b397..88a7008 100644
--- a/chrome/browser/ui/app_list/search/webstore/webstore_provider.cc
+++ b/chrome/browser/ui/app_list/search/webstore/webstore_provider.cc
@@ -114,7 +114,7 @@ void WebstoreProvider::ProcessWebstoreSearchResults(
   }
 
   bool first_result = true;
-  for (ListValue::const_iterator it = result_list->begin();
+  for (base::ListValue::const_iterator it = result_list->begin();
        it != result_list->end();
        ++it) {
     const base::DictionaryValue* dict;
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
index 1e9d34a..42554cd 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
@@ -1906,7 +1906,7 @@ ChromeLauncherController::GetListOfPinnedAppsAndBrowser() {
       pinned_apps.push_back(extension_misc::kChromeAppId);
       chrome_icon_added = true;
     }
-    const DictionaryValue* app = NULL;
+    const base::DictionaryValue* app = NULL;
     std::string app_id;
     if (pinned_apps_pref->GetDictionary(index, &app) &&
         app->GetString(ash::kPinnedAppsPrefAppIDPath, &app_id) &&
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
index 78d7b55..9582598d 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
@@ -284,7 +284,7 @@ class ChromeLauncherControllerTest : public BrowserWithTestWindowTest {
           new ash::ShelfItemDelegateManager(model_.get());
     }
 
-    DictionaryValue manifest;
+    base::DictionaryValue manifest;
     manifest.SetString(extensions::manifest_keys::kName,
                        "launcher controller test extension");
     manifest.SetString(extensions::manifest_keys::kVersion, "1");
@@ -309,7 +309,7 @@ class ChromeLauncherControllerTest : public BrowserWithTestWindowTest {
                                     "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
                                     &error);
     // Fake gmail extension.
-    DictionaryValue manifest_gmail;
+    base::DictionaryValue manifest_gmail;
     manifest_gmail.SetString(extensions::manifest_keys::kName,
                              "Gmail launcher controller test extension");
     manifest_gmail.SetString(extensions::manifest_keys::kVersion, "1");
@@ -317,8 +317,8 @@ class ChromeLauncherControllerTest : public BrowserWithTestWindowTest {
                              "for testing pinned Gmail");
     manifest_gmail.SetString(extensions::manifest_keys::kLaunchWebURL,
                              kGmailLaunchURL);
-    ListValue* list = new ListValue();
-    list->Append(Value::CreateStringValue("*://mail.google.com/mail/ca"));
+    base::ListValue* list = new base::ListValue();
+    list->Append(base::Value::CreateStringValue("*://mail.google.com/mail/ca"));
     manifest_gmail.Set(extensions::manifest_keys::kWebURLs, list);
 
     extension3_ = Extension::Create(base::FilePath(), Manifest::UNPACKED,
@@ -455,7 +455,7 @@ class ChromeLauncherControllerTest : public BrowserWithTestWindowTest {
   void InsertPrefValue(base::ListValue* pref_value,
                        int index,
                        const std::string& extension_id) {
-    base::DictionaryValue* entry = new DictionaryValue();
+    base::DictionaryValue* entry = new base::DictionaryValue();
     entry->SetString(ash::kPinnedAppsPrefAppIDPath, extension_id);
     pref_value->Insert(index, entry);
   }
diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc
index 67e93e4..8aaf667 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc
@@ -1203,7 +1203,7 @@ TEST_F(AutofillDialogControllerTest, AcceptLegalDocuments) {
     // Now try it all over again with the location disclosure already accepted.
     // Nothing should change.
     Reset();
-    ListValue preexisting_list;
+    base::ListValue preexisting_list;
     preexisting_list.AppendString(kFakeEmail);
     g_browser_process->local_state()->Set(
         ::prefs::kAutofillDialogWalletLocationAcceptance,
@@ -1230,7 +1230,7 @@ TEST_F(AutofillDialogControllerTest, RejectLegalDocuments) {
     // Now try it all over again with the location disclosure already accepted.
     // Nothing should change.
     Reset();
-    ListValue preexisting_list;
+    base::ListValue preexisting_list;
     preexisting_list.AppendString(kFakeEmail);
     g_browser_process->local_state()->Set(
         ::prefs::kAutofillDialogWalletLocationAcceptance,
@@ -1249,7 +1249,7 @@ TEST_F(AutofillDialogControllerTest, AcceptLocationDisclosure) {
   EXPECT_TRUE(controller()->LegalDocumentLinks().empty());
   controller()->OnAccept();
 
-  const ListValue* list = g_browser_process->local_state()->GetList(
+  const base::ListValue* list = g_browser_process->local_state()->GetList(
       ::prefs::kAutofillDialogWalletLocationAcceptance);
   ASSERT_EQ(1U, list->GetSize());
   std::string accepted_username;
@@ -1264,7 +1264,7 @@ TEST_F(AutofillDialogControllerTest, AcceptLocationDisclosure) {
   ASSERT_TRUE(list->empty());
 
   std::string kOtherUsername("spouse@example.com");
-  ListValue preexisting_list;
+  base::ListValue preexisting_list;
   preexisting_list.AppendString(kOtherUsername);
   g_browser_process->local_state()->Set(
       ::prefs::kAutofillDialogWalletLocationAcceptance,
diff --git a/chrome/browser/ui/cocoa/applescript/apple_event_util.mm b/chrome/browser/ui/cocoa/applescript/apple_event_util.mm
index 2a4c1e9..aa4ac44 100644
--- a/chrome/browser/ui/cocoa/applescript/apple_event_util.mm
+++ b/chrome/browser/ui/cocoa/applescript/apple_event_util.mm
@@ -64,7 +64,8 @@ NSAppleEventDescriptor* ValueToAppleEventDescriptor(const base::Value* value) {
       descriptor = [NSAppleEventDescriptor recordDescriptor];
       NSAppleEventDescriptor* userRecord = [NSAppleEventDescriptor
           listDescriptor];
-      for (DictionaryValue::Iterator iter(*dictionary_value); !iter.IsAtEnd();
+      for (base::DictionaryValue::Iterator iter(*dictionary_value);
+           !iter.IsAtEnd();
            iter.Advance()) {
         [userRecord insertDescriptor:[NSAppleEventDescriptor
             descriptorWithString:base::SysUTF8ToNSString(iter.key())]
diff --git a/chrome/browser/ui/cocoa/browser_window_controller_private.mm b/chrome/browser/ui/cocoa/browser_window_controller_private.mm
index 01bb5e6..2083420 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm
@@ -123,7 +123,7 @@ const CGFloat kLocBarBottomInset = 1;
   DictionaryPrefUpdate update(
       prefs,
       chrome::GetWindowPlacementKey(browser_.get()).c_str());
-  DictionaryValue* windowPreferences = update.Get();
+  base::DictionaryValue* windowPreferences = update.Get();
   windowPreferences->SetInteger("left", bounds.x());
   windowPreferences->SetInteger("top", bounds.y());
   windowPreferences->SetInteger("right", bounds.right());
diff --git a/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm b/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm
index d4485e2..ce5c71c 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm
@@ -99,7 +99,7 @@ TEST_F(BrowserWindowControllerTest, TestSaveWindowPosition) {
   ASSERT_TRUE(prefs != NULL);
 
   // Check to make sure there is no existing pref for window placement.
-  const DictionaryValue* browser_window_placement =
+  const base::DictionaryValue* browser_window_placement =
       prefs->GetDictionary(prefs::kBrowserWindowPlacement);
   ASSERT_TRUE(browser_window_placement);
   EXPECT_TRUE(browser_window_placement->empty());
diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.mm b/chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.mm
index 3a869aa..a6cd778 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.mm
@@ -36,7 +36,7 @@ scoped_refptr<extensions::Extension> LoadInstallPromptExtension(
 
   std::string error;
   JSONFileValueSerializer serializer(path);
-  scoped_ptr<DictionaryValue> value(static_cast<DictionaryValue*>(
+  scoped_ptr<base::DictionaryValue> value(static_cast<base::DictionaryValue*>(
       serializer.Deserialize(NULL, &error)));
   if (!value.get()) {
     LOG(ERROR) << error;
diff --git a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm
index 1ae61bc..6298663 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm
@@ -86,20 +86,20 @@ class ExtensionInstalledBubbleControllerTest : public CocoaProfileTest {
     PathService::Get(chrome::DIR_TEST_DATA, &path);
     path = path.AppendASCII("extensions").AppendASCII("dummy");
 
-    DictionaryValue extension_input_value;
+    base::DictionaryValue extension_input_value;
     extension_input_value.SetString(keys::kVersion, "1.0.0.0");
     if (type == extension_installed_bubble::kPageAction) {
       extension_input_value.SetString(keys::kName, "page action extension");
-      DictionaryValue* action = new DictionaryValue;
+      base::DictionaryValue* action = new base::DictionaryValue;
       action->SetString(keys::kPageActionId, "ExtensionActionId");
       action->SetString(keys::kPageActionDefaultTitle, "ExtensionActionTitle");
       action->SetString(keys::kPageActionDefaultIcon, "image1.png");
-      ListValue* action_list = new ListValue;
+      base::ListValue* action_list = new base::ListValue;
       action_list->Append(action);
       extension_input_value.Set(keys::kPageActions, action_list);
     } else if (type == extension_installed_bubble::kBrowserAction) {
       extension_input_value.SetString(keys::kName, "browser action extension");
-      DictionaryValue* browser_action = new DictionaryValue;
+      base::DictionaryValue* browser_action = new base::DictionaryValue;
       // An empty dictionary is enough to create a Browser Action.
       extension_input_value.Set(keys::kBrowserAction, browser_action);
     } else if (type == extension_installed_bubble::kApp) {
diff --git a/chrome/browser/ui/cocoa/window_size_autosaver.mm b/chrome/browser/ui/cocoa/window_size_autosaver.mm
index 63eb986..c5716f8 100644
--- a/chrome/browser/ui/cocoa/window_size_autosaver.mm
+++ b/chrome/browser/ui/cocoa/window_size_autosaver.mm
@@ -54,7 +54,7 @@ const int kMinWindowHeight = 17;
 
 - (void)save:(NSNotification*)notification {
   DictionaryPrefUpdate update(prefService_, path_);
-  DictionaryValue* windowPrefs = update.Get();
+  base::DictionaryValue* windowPrefs = update.Get();
   NSRect frame = [window_ frame];
   if ([window_ styleMask] & NSResizableWindowMask) {
     // Save the origin of the window.
@@ -74,7 +74,7 @@ const int kMinWindowHeight = 17;
 
 - (void)restore {
   // Get the positioning information.
-  const DictionaryValue* windowPrefs = prefService_->GetDictionary(path_);
+  const base::DictionaryValue* windowPrefs = prefService_->GetDictionary(path_);
   if ([window_ styleMask] & NSResizableWindowMask) {
     int x1, x2, y1, y2;
     if (!windowPrefs->GetInteger("left", &x1) ||
@@ -86,7 +86,7 @@ const int kMinWindowHeight = 17;
     if (x2 - x1 < kMinWindowWidth || y2 - y1 < kMinWindowHeight) {
       // Windows should never be very small.
       DictionaryPrefUpdate update(prefService_, path_);
-      DictionaryValue* mutableWindowPrefs = update.Get();
+      base::DictionaryValue* mutableWindowPrefs = update.Get();
       mutableWindowPrefs->Remove("left", NULL);
       mutableWindowPrefs->Remove("right", NULL);
       mutableWindowPrefs->Remove("top", NULL);
diff --git a/chrome/browser/ui/cocoa/window_size_autosaver_unittest.mm b/chrome/browser/ui/cocoa/window_size_autosaver_unittest.mm
index 9a86034..febbdd5 100644
--- a/chrome/browser/ui/cocoa/window_size_autosaver_unittest.mm
+++ b/chrome/browser/ui/cocoa/window_size_autosaver_unittest.mm
@@ -50,7 +50,7 @@ TEST_F(WindowSizeAutosaverTest, RestoresAndSavesPos) {
   ASSERT_TRUE(pref != NULL);
 
   // Check to make sure there is no existing pref for window placement.
-  const DictionaryValue* placement = pref->GetDictionary(path_);
+  const base::DictionaryValue* placement = pref->GetDictionary(path_);
   ASSERT_TRUE(placement);
   EXPECT_TRUE(placement->empty());
 
@@ -101,7 +101,7 @@ TEST_F(WindowSizeAutosaverTest, RestoresAndSavesPos) {
   // ...and it should be in the profile, too.
   EXPECT_TRUE(pref->GetDictionary(path_) != NULL);
   int x, y;
-  const DictionaryValue* windowPref = pref->GetDictionary(path_);
+  const base::DictionaryValue* windowPref = pref->GetDictionary(path_);
   EXPECT_FALSE(windowPref->GetInteger("left", &x));
   EXPECT_FALSE(windowPref->GetInteger("right", &x));
   EXPECT_FALSE(windowPref->GetInteger("top", &x));
@@ -117,7 +117,7 @@ TEST_F(WindowSizeAutosaverTest, RestoresAndSavesRect) {
   ASSERT_TRUE(pref != NULL);
 
   // Check to make sure there is no existing pref for window placement.
-  const DictionaryValue* placement = pref->GetDictionary(path_);
+  const base::DictionaryValue* placement = pref->GetDictionary(path_);
   ASSERT_TRUE(placement);
   EXPECT_TRUE(placement->empty());
 
@@ -160,7 +160,7 @@ TEST_F(WindowSizeAutosaverTest, RestoresAndSavesRect) {
   // ...and it should be in the profile, too.
   EXPECT_TRUE(pref->GetDictionary(path_) != NULL);
   int x1, y1, x2, y2;
-  const DictionaryValue* windowPref = pref->GetDictionary(path_);
+  const base::DictionaryValue* windowPref = pref->GetDictionary(path_);
   EXPECT_FALSE(windowPref->GetInteger("x", &x1));
   EXPECT_FALSE(windowPref->GetInteger("y", &x1));
   ASSERT_TRUE(windowPref->GetInteger("left", &x1));
@@ -179,7 +179,7 @@ TEST_F(WindowSizeAutosaverTest, DoesNotRestoreButClearsEmptyRect) {
   ASSERT_TRUE(pref != NULL);
 
   DictionaryPrefUpdate update(pref, path_);
-  DictionaryValue* windowPref = update.Get();
+  base::DictionaryValue* windowPref = update.Get();
   windowPref->SetInteger("left", 50);
   windowPref->SetInteger("right", 50);
   windowPref->SetInteger("top", 60);
diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
index a98758a..2a72eca 100644
--- a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
@@ -338,7 +338,7 @@ void ContentSettingSingleRadioGroup::SetRadioGroup() {
   } else {
     SettingInfo info;
     HostContentSettingsMap* map = profile()->GetHostContentSettingsMap();
-    scoped_ptr<Value> value(map->GetWebsiteSetting(
+    scoped_ptr<base::Value> value(map->GetWebsiteSetting(
         url, url, content_type(), std::string(), &info));
     setting = content_settings::ValueToContentSetting(value.get());
     setting_source = info.source;
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc
index b0a9239..4548a79 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_window_gtk.cc
@@ -1871,7 +1871,7 @@ void BrowserWindowGtk::SaveWindowPosition() {
   std::string window_name = chrome::GetWindowPlacementKey(browser_.get());
   DictionaryPrefUpdate update(browser_->profile()->GetPrefs(),
                               window_name.c_str());
-  DictionaryValue* window_preferences = update.Get();
+  base::DictionaryValue* window_preferences = update.Get();
   // Note that we store left/top for consistency with Windows, but that we
   // *don't* obey them; we only use them for computing width/height.  See
   // comments in SetGeometryHints().
diff --git a/chrome/browser/ui/gtk/task_manager_gtk.cc b/chrome/browser/ui/gtk/task_manager_gtk.cc
index 43788e0..42dc87a 100644
--- a/chrome/browser/ui/gtk/task_manager_gtk.cc
+++ b/chrome/browser/ui/gtk/task_manager_gtk.cc
@@ -528,7 +528,7 @@ void TaskManagerGtk::SetInitialDialogSize() {
                    G_CALLBACK(OnTreeViewRealizeThunk), this);
   // If we previously saved the dialog's bounds, use them.
   if (g_browser_process->local_state()) {
-    const DictionaryValue* placement_pref =
+    const base::DictionaryValue* placement_pref =
         g_browser_process->local_state()->GetDictionary(
             prefs::kTaskManagerWindowPlacement);
     int top = 0, left = 0, bottom = 1, right = 1;
@@ -813,7 +813,7 @@ void TaskManagerGtk::OnResponse(GtkWidget* dialog, int response_id) {
 
       DictionaryPrefUpdate update(g_browser_process->local_state(),
                                   prefs::kTaskManagerWindowPlacement);
-      DictionaryValue* placement_pref = update.Get();
+      base::DictionaryValue* placement_pref = update.Get();
       // Note that we store left/top for consistency with Windows, but that we
       // *don't* restore them.
       placement_pref->SetInteger("left", dialog_bounds.x());
diff --git a/chrome/browser/ui/panels/base_panel_browser_test.cc b/chrome/browser/ui/panels/base_panel_browser_test.cc
index b3688c5..b19e171 100644
--- a/chrome/browser/ui/panels/base_panel_browser_test.cc
+++ b/chrome/browser/ui/panels/base_panel_browser_test.cc
@@ -554,12 +554,12 @@ NativePanelTesting* BasePanelBrowserTest::CreateNativePanelTesting(
 scoped_refptr<Extension> BasePanelBrowserTest::CreateExtension(
     const base::FilePath::StringType& path,
     extensions::Manifest::Location location,
-    const DictionaryValue& extra_value) {
+    const base::DictionaryValue& extra_value) {
   extensions::ExtensionPrefs* extension_prefs =
       extensions::ExtensionPrefs::Get(browser()->profile());
   base::FilePath full_path = extension_prefs->install_directory().Append(path);
 
-  scoped_ptr<DictionaryValue> input_value(extra_value.DeepCopy());
+  scoped_ptr<base::DictionaryValue> input_value(extra_value.DeepCopy());
   input_value->SetString(extensions::manifest_keys::kVersion, "1.0.0.0");
   input_value->SetString(extensions::manifest_keys::kName, "Sample Extension");
 
diff --git a/chrome/browser/ui/panels/base_panel_browser_test.h b/chrome/browser/ui/panels/base_panel_browser_test.h
index 2953dd1..bd5a10d4 100644
--- a/chrome/browser/ui/panels/base_panel_browser_test.h
+++ b/chrome/browser/ui/panels/base_panel_browser_test.h
@@ -105,7 +105,7 @@ class BasePanelBrowserTest : public InProcessBrowserTest {
   scoped_refptr<extensions::Extension> CreateExtension(
       const base::FilePath::StringType& path,
       extensions::Manifest::Location location,
-      const DictionaryValue& extra_value);
+      const base::DictionaryValue& extra_value);
 
   void MoveMouseAndWaitForExpansionStateChange(Panel* panel,
                                                const gfx::Point& position);
diff --git a/chrome/browser/ui/panels/panel.cc b/chrome/browser/ui/panels/panel.cc
index 5eb5764..a7456f9 100644
--- a/chrome/browser/ui/panels/panel.cc
+++ b/chrome/browser/ui/panels/panel.cc
@@ -93,9 +93,9 @@ PanelExtensionWindowController::CreateWindowValueWithTabs(
   base::DictionaryValue* result = CreateWindowValue();
 
   DCHECK(IsVisibleToExtension(extension));
-  DictionaryValue* tab_value = CreateTabValue(extension, 0);
+  base::DictionaryValue* tab_value = CreateTabValue(extension, 0);
   if (tab_value) {
-    base::ListValue* tab_list = new ListValue();
+    base::ListValue* tab_list = new base::ListValue();
     tab_list->Append(tab_value);
     result->Set(extensions::tabs_constants::kTabsKey, tab_list);
   }
@@ -112,7 +112,7 @@ base::DictionaryValue* PanelExtensionWindowController::CreateTabValue(
     return NULL;
 
   DCHECK(IsVisibleToExtension(extension));
-  DictionaryValue* tab_value = new DictionaryValue();
+  base::DictionaryValue* tab_value = new base::DictionaryValue();
   tab_value->SetInteger(extensions::tabs_constants::kIdKey,
                         SessionID::IdForTab(web_contents));
   tab_value->SetInteger(extensions::tabs_constants::kIndexKey, 0);
diff --git a/chrome/browser/ui/panels/panel_browsertest.cc b/chrome/browser/ui/panels/panel_browsertest.cc
index 80ef7a8..d129c1c 100644
--- a/chrome/browser/ui/panels/panel_browsertest.cc
+++ b/chrome/browser/ui/panels/panel_browsertest.cc
@@ -1378,7 +1378,7 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest,
 IN_PROC_BROWSER_TEST_F(PanelBrowserTest,
                        NonExtensionDomainPanelsCloseOnUninstall) {
   // Create a test extension.
-  DictionaryValue empty_value;
+  base::DictionaryValue empty_value;
   scoped_refptr<extensions::Extension> extension =
       CreateExtension(FILE_PATH_LITERAL("TestExtension"),
                       extensions::Manifest::INTERNAL, empty_value);
diff --git a/chrome/browser/ui/panels/stacked_panel_browsertest.cc b/chrome/browser/ui/panels/stacked_panel_browsertest.cc
index 42103aa..9dc0ba7 100644
--- a/chrome/browser/ui/panels/stacked_panel_browsertest.cc
+++ b/chrome/browser/ui/panels/stacked_panel_browsertest.cc
@@ -976,7 +976,7 @@ IN_PROC_BROWSER_TEST_F(StackedPanelBrowserTest,
   PanelManager* panel_manager = PanelManager::GetInstance();
 
   // Create 2 test extensions.
-  DictionaryValue empty_value;
+  base::DictionaryValue empty_value;
   scoped_refptr<extensions::Extension> extension1 =
       CreateExtension(FILE_PATH_LITERAL("TestExtension1"),
                       extensions::Manifest::INTERNAL, empty_value);
diff --git a/chrome/browser/ui/pdf/pdf_unsupported_feature.cc b/chrome/browser/ui/pdf/pdf_unsupported_feature.cc
index 644552d..b549fdd 100644
--- a/chrome/browser/ui/pdf/pdf_unsupported_feature.cc
+++ b/chrome/browser/ui/pdf/pdf_unsupported_feature.cc
@@ -173,7 +173,7 @@ class PDFUnsupportedFeatureInterstitial
  protected:
   // InterstitialPageDelegate implementation.
   virtual std::string GetHTMLContents() OVERRIDE {
-    DictionaryValue strings;
+    base::DictionaryValue strings;
     strings.SetString(
         "title",
         l10n_util::GetStringUTF16(IDS_READER_OUT_OF_DATE_BLOCKING_PAGE_TITLE));
diff --git a/chrome/browser/ui/sync/one_click_signin_helper.cc b/chrome/browser/ui/sync/one_click_signin_helper.cc
index a5779ef..86a734d 100644
--- a/chrome/browser/ui/sync/one_click_signin_helper.cc
+++ b/chrome/browser/ui/sync/one_click_signin_helper.cc
@@ -758,7 +758,7 @@ bool OneClickSigninHelper::CanOffer(content::WebContents* web_contents,
 
     // If email was already rejected by this profile for one-click sign-in.
     if (can_offer_for == CAN_OFFER_FOR_INTERSTITAL_ONLY) {
-      const ListValue* rejected_emails = profile->GetPrefs()->GetList(
+      const base::ListValue* rejected_emails = profile->GetPrefs()->GetList(
           prefs::kReverseAutologinRejectedEmailList);
       if (!rejected_emails->empty()) {
         base::ListValue::const_iterator iter = rejected_emails->Find(
diff --git a/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc b/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc
index 58cb52a..2327905 100644
--- a/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc
+++ b/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc
@@ -96,7 +96,7 @@ const base::FilePath::CharType kExtensionFilePath[] =
 static scoped_refptr<extensions::Extension> CreateExtension(
     const std::string& name,
     const std::string& id) {
-  DictionaryValue manifest;
+  base::DictionaryValue manifest;
   manifest.SetString(extensions::manifest_keys::kVersion, "1.0.0.0");
   manifest.SetString(extensions::manifest_keys::kName, name);
   std::string error;
diff --git a/chrome/browser/ui/tabs/pinned_tab_codec.cc b/chrome/browser/ui/tabs/pinned_tab_codec.cc
index ebfd6aa..0140142 100644
--- a/chrome/browser/ui/tabs/pinned_tab_codec.cc
+++ b/chrome/browser/ui/tabs/pinned_tab_codec.cc
@@ -39,20 +39,20 @@ static bool HasPinnedTabs(Browser* browser) {
 }
 
 // Adds a DictionaryValue to |values| representing |tab|.
-static void EncodeTab(const StartupTab& tab, ListValue* values) {
-  scoped_ptr<DictionaryValue> value(new DictionaryValue);
+static void EncodeTab(const StartupTab& tab, base::ListValue* values) {
+  scoped_ptr<base::DictionaryValue> value(new base::DictionaryValue);
   value->SetString(kURL, tab.url.spec());
   if (tab.is_app)
     value->SetString(kAppID, tab.app_id);
   values->Append(value.release());
 }
 
-// Adds a DictionaryValue to |values| representing the pinned tab at the
+// Adds a base::DictionaryValue to |values| representing the pinned tab at the
 // specified index.
 static void EncodePinnedTab(TabStripModel* model,
                             int index,
-                            ListValue* values) {
-  scoped_ptr<DictionaryValue> value(new DictionaryValue());
+                            base::ListValue* values) {
+  scoped_ptr<base::DictionaryValue> value(new base::DictionaryValue());
 
   content::WebContents* web_contents = model->GetWebContentsAt(index);
   if (model->IsAppTab(index)) {
@@ -78,7 +78,7 @@ static void EncodePinnedTab(TabStripModel* model,
 }
 
 // Invokes EncodePinnedTab for each pinned tab in browser.
-static void EncodePinnedTabs(Browser* browser, ListValue* values) {
+static void EncodePinnedTabs(Browser* browser, base::ListValue* values) {
   TabStripModel* tab_model = browser->tab_strip_model();
   for (int i = 0; i < tab_model->count() && tab_model->IsTabPinned(i); ++i)
     EncodePinnedTab(tab_model, i, values);
@@ -86,7 +86,7 @@ static void EncodePinnedTabs(Browser* browser, ListValue* values) {
 
 // Decodes the previously written values in |value| to |tab|, returning true
 // on success.
-static bool DecodeTab(const DictionaryValue& value, StartupTab* tab) {
+static bool DecodeTab(const base::DictionaryValue& value, StartupTab* tab) {
   tab->is_app = false;
 
   std::string url_string;
@@ -113,7 +113,7 @@ void PinnedTabCodec::WritePinnedTabs(Profile* profile) {
   if (!prefs)
     return;
 
-  ListValue values;
+  base::ListValue values;
   for (chrome::BrowserIterator it; !it.done(); it.Next()) {
     Browser* browser = *it;
     if (browser->is_type_tabbed() &&
@@ -132,7 +132,7 @@ void PinnedTabCodec::WritePinnedTabs(Profile* profile,
     return;
 
   ListPrefUpdate update(prefs, prefs::kPinnedTabs);
-  ListValue* values = update.Get();
+  base::ListValue* values = update.Get();
   values->Clear();
   for (StartupTabs::const_iterator i = tabs.begin(); i != tabs.end(); ++i)
     EncodeTab(*i, values);
diff --git a/chrome/browser/ui/tabs/tab_strip_model_unittest.cc b/chrome/browser/ui/tabs/tab_strip_model_unittest.cc
index fd2481a..0e520a0 100644
--- a/chrome/browser/ui/tabs/tab_strip_model_unittest.cc
+++ b/chrome/browser/ui/tabs/tab_strip_model_unittest.cc
@@ -1783,7 +1783,7 @@ TEST_F(TabStripModelTest, Apps) {
   base::FilePath path(FILE_PATH_LITERAL("/foo"));
 #endif
 
-  DictionaryValue manifest;
+  base::DictionaryValue manifest;
   manifest.SetString("name", "hi!");
   manifest.SetString("version", "1");
   manifest.SetString("app.launch.web_url", "http://www.google.com");
diff --git a/chrome/browser/ui/views/about_ipc_dialog.cc b/chrome/browser/ui/views/about_ipc_dialog.cc
index 35427fa..474a8d1 100644
--- a/chrome/browser/ui/views/about_ipc_dialog.cc
+++ b/chrome/browser/ui/views/about_ipc_dialog.cc
@@ -128,7 +128,7 @@ void CloseDialog() {
   PrefService* prefs = current_profile->GetPrefs();
   if (!prefs->FindPreference(prefs::kIpcDisabledMessages))
     return;
-  ListValue* list = prefs->GetMutableList(prefs::kIpcDisabledMessages);
+  base::ListValue* list = prefs->GetMutableList(prefs::kIpcDisabledMessages);
   list->Clear();
   for (std::set<int>::const_iterator itr = disabled_messages_.begin();
        itr != disabled_messages_.end();
diff --git a/chrome/browser/ui/views/chrome_views_delegate.cc b/chrome/browser/ui/views/chrome_views_delegate.cc
index b1faf5a..8bb3526 100644
--- a/chrome/browser/ui/views/chrome_views_delegate.cc
+++ b/chrome/browser/ui/views/chrome_views_delegate.cc
@@ -79,7 +79,7 @@ void ChromeViewsDelegate::SaveWindowPlacement(const views::Widget* window,
 
   DCHECK(prefs->FindPreference(window_name.c_str()));
   DictionaryPrefUpdate update(prefs, window_name.c_str());
-  DictionaryValue* window_preferences = update.Get();
+  base::DictionaryValue* window_preferences = update.Get();
   window_preferences->SetInteger("left", bounds.x());
   window_preferences->SetInteger("top", bounds.y());
   window_preferences->SetInteger("right", bounds.right());
@@ -104,7 +104,8 @@ bool ChromeViewsDelegate::GetSavedWindowPlacement(
     return false;
 
   DCHECK(prefs->FindPreference(window_name.c_str()));
-  const DictionaryValue* dictionary = prefs->GetDictionary(window_name.c_str());
+  const base::DictionaryValue* dictionary =
+      prefs->GetDictionary(window_name.c_str());
   int left, top, right, bottom;
   if (!dictionary || !dictionary->GetInteger("left", &left) ||
       !dictionary->GetInteger("top", &top) ||