diff options
Diffstat (limited to 'chrome/browser')
110 files changed, 849 insertions, 795 deletions
diff --git a/chrome/browser/extensions/extension_tab_util_android.cc b/chrome/browser/extensions/extension_tab_util_android.cc index 3997af1..da7be3f 100644 --- a/chrome/browser/extensions/extension_tab_util_android.cc +++ b/chrome/browser/extensions/extension_tab_util_android.cc @@ -8,8 +8,6 @@ #include "chrome/browser/sessions/session_id.h" #include "url/gurl.h" -using base::DictionaryValue; -using base::ListValue; using content::WebContents; namespace extensions { @@ -39,23 +37,24 @@ int ExtensionTabUtil::GetWindowIdOfTab(const WebContents* web_contents) { } // static -DictionaryValue* ExtensionTabUtil::CreateTabValue(const WebContents* contents, - TabStripModel* tab_strip, - int tab_index, - const Extension* extension) { +base::DictionaryValue* ExtensionTabUtil::CreateTabValue( + const WebContents* contents, + TabStripModel* tab_strip, + int tab_index, + const Extension* extension) { NOTIMPLEMENTED(); return NULL; } // static -ListValue* ExtensionTabUtil::CreateTabList(const Browser* browser, - const Extension* extension) { +base::ListValue* ExtensionTabUtil::CreateTabList(const Browser* browser, + const Extension* extension) { NOTIMPLEMENTED(); return NULL; } // static -DictionaryValue* ExtensionTabUtil::CreateTabValue( +base::DictionaryValue* ExtensionTabUtil::CreateTabValue( const WebContents* contents, TabStripModel* tab_strip, int tab_index) { diff --git a/chrome/browser/extensions/extension_ui_unittest.cc b/chrome/browser/extensions/extension_ui_unittest.cc index d981011..f613e1e 100644 --- a/chrome/browser/extensions/extension_ui_unittest.cc +++ b/chrome/browser/extensions/extension_ui_unittest.cc @@ -54,24 +54,25 @@ class ExtensionUITest : public testing::Test { message_loop_.RunUntilIdle(); } - static DictionaryValue* DeserializeJSONTestData(const base::FilePath& path, + static base::DictionaryValue* DeserializeJSONTestData( + const base::FilePath& path, std::string *error) { - Value* value; + base::Value* value; JSONFileValueSerializer serializer(path); value = serializer.Deserialize(NULL, error); - return static_cast<DictionaryValue*>(value); + return static_cast<base::DictionaryValue*>(value); } - DictionaryValue* CreateExtensionDetailViewFromPath( + base::DictionaryValue* CreateExtensionDetailViewFromPath( const base::FilePath& extension_path, const std::vector<ExtensionPage>& pages, Manifest::Location location) { std::string error; base::FilePath manifest_path = extension_path.Append(kManifestFilename); - scoped_ptr<DictionaryValue> extension_data(DeserializeJSONTestData( + scoped_ptr<base::DictionaryValue> extension_data(DeserializeJSONTestData( manifest_path, &error)); EXPECT_EQ("", error); @@ -90,12 +91,12 @@ class ExtensionUITest : public testing::Test { const base::FilePath& expected_output_path) { std::string error; - scoped_ptr<DictionaryValue> expected_output_data(DeserializeJSONTestData( - expected_output_path, &error)); + scoped_ptr<base::DictionaryValue> expected_output_data( + DeserializeJSONTestData(expected_output_path, &error)); EXPECT_EQ("", error); // Produce test output. - scoped_ptr<DictionaryValue> actual_output_data( + scoped_ptr<base::DictionaryValue> actual_output_data( CreateExtensionDetailViewFromPath( extension_path, pages, Manifest::INVALID_LOCATION)); @@ -104,10 +105,10 @@ class ExtensionUITest : public testing::Test { std::string paths_details = " - expected (" + expected_output_path.MaybeAsASCII() + ") vs. actual (" + extension_path.MaybeAsASCII() + ")"; - for (DictionaryValue::Iterator field(*expected_output_data); + for (base::DictionaryValue::Iterator field(*expected_output_data); !field.IsAtEnd(); field.Advance()) { - const Value* expected_value = &field.value(); - Value* actual_value = NULL; + const base::Value* expected_value = &field.value(); + base::Value* actual_value = NULL; EXPECT_TRUE(actual_output_data->Get(field.key(), &actual_value)) << field.key() + " is missing" + paths_details; EXPECT_TRUE(expected_value->Equals(actual_value)) << field.key() + @@ -206,7 +207,7 @@ TEST_F(ExtensionUITest, LocationLoadPropagation) { std::vector<ExtensionPage> pages; - scoped_ptr<DictionaryValue> extension_details( + scoped_ptr<base::DictionaryValue> extension_details( CreateExtensionDetailViewFromPath( extension_path, pages, Manifest::UNPACKED)); @@ -238,7 +239,7 @@ TEST_F(ExtensionUITest, LocationExternalPrefPropagation) { std::vector<ExtensionPage> pages; - scoped_ptr<DictionaryValue> extension_details( + scoped_ptr<base::DictionaryValue> extension_details( CreateExtensionDetailViewFromPath( extension_path, pages, Manifest::EXTERNAL_PREF)); @@ -267,7 +268,7 @@ TEST_F(ExtensionUITest, PathPropagation) { std::vector<ExtensionPage> pages; - scoped_ptr<DictionaryValue> extension_details( + scoped_ptr<base::DictionaryValue> extension_details( CreateExtensionDetailViewFromPath( extension_path, pages, Manifest::UNPACKED)); diff --git a/chrome/browser/extensions/extension_web_ui.cc b/chrome/browser/extensions/extension_web_ui.cc index 914c5db..d187a8c 100644 --- a/chrome/browser/extensions/extension_web_ui.cc +++ b/chrome/browser/extensions/extension_web_ui.cc @@ -185,7 +185,7 @@ bool ExtensionWebUI::HandleChromeURLOverride( size_t i = 0; while (i < url_list->GetSize()) { - const Value* val = NULL; + const base::Value* val = NULL; url_list->Get(i, &val); // Verify that the override value is good. If not, unregister it and find @@ -311,7 +311,7 @@ void ExtensionWebUI::RegisterChromeURLOverrides( } // Insert the override at the front of the list. Last registered override // wins. - page_overrides->Insert(0, new StringValue(iter->second.spec())); + page_overrides->Insert(0, new base::StringValue(iter->second.spec())); } } @@ -319,7 +319,7 @@ void ExtensionWebUI::RegisterChromeURLOverrides( void ExtensionWebUI::UnregisterAndReplaceOverride(const std::string& page, Profile* profile, base::ListValue* list, - const Value* override) { + const base::Value* override) { size_t index = 0; bool found = list->Remove(*override, &index); if (found && index == 0) { @@ -334,7 +334,7 @@ void ExtensionWebUI::UnregisterAndReplaceOverride(const std::string& page, // static void ExtensionWebUI::UnregisterChromeURLOverride(const std::string& page, Profile* profile, - const Value* override) { + const base::Value* override) { if (!override) return; PrefService* prefs = profile->GetPrefs(); @@ -367,7 +367,7 @@ void ExtensionWebUI::UnregisterChromeURLOverrides( NOTREACHED(); continue; } else { - StringValue override(iter->second.spec()); + base::StringValue override(iter->second.spec()); UnregisterAndReplaceOverride(iter->first, profile, page_overrides, &override); } diff --git a/chrome/browser/extensions/external_policy_loader.cc b/chrome/browser/extensions/external_policy_loader.cc index 61c8363..ddf509a 100644 --- a/chrome/browser/extensions/external_policy_loader.cc +++ b/chrome/browser/extensions/external_policy_loader.cc @@ -56,7 +56,7 @@ void ExternalPolicyLoader::Observe( } void ExternalPolicyLoader::StartLoading() { - const DictionaryValue* forcelist = + const base::DictionaryValue* forcelist = profile_->GetPrefs()->GetDictionary(prefs::kExtensionInstallForceList); prefs_.reset(forcelist ? forcelist->DeepCopy() : NULL); LoadFinished(); diff --git a/chrome/browser/extensions/external_pref_loader.h b/chrome/browser/extensions/external_pref_loader.h index 231fbe3..c4508c2 100644 --- a/chrome/browser/extensions/external_pref_loader.h +++ b/chrome/browser/extensions/external_pref_loader.h @@ -63,14 +63,14 @@ class ExternalPrefLoader : public ExternalLoader { // regarding which extensions to install. |prefs| will be modified to // receive the extracted extension information. // Must be called from the File thread. - void ReadExternalExtensionPrefFile(DictionaryValue * prefs); + void ReadExternalExtensionPrefFile(base::DictionaryValue* prefs); // Extracts the information contained in standalone external extension // json files (<extension id>.json) regarding what external extensions // to install. |prefs| will be modified to receive the extracted extension // information. // Must be called from the File thread. - void ReadStandaloneExtensionPrefFiles(DictionaryValue * prefs); + void ReadStandaloneExtensionPrefFiles(base::DictionaryValue* prefs); // The path (coresponding to |base_path_id_| containing the json files // describing which extensions to load. @@ -97,7 +97,7 @@ class ExternalTestingLoader : public ExternalLoader { virtual ~ExternalTestingLoader(); base::FilePath fake_base_path_; - scoped_ptr<DictionaryValue> testing_prefs_; + scoped_ptr<base::DictionaryValue> testing_prefs_; DISALLOW_COPY_AND_ASSIGN(ExternalTestingLoader); }; diff --git a/chrome/browser/extensions/external_provider_impl.cc b/chrome/browser/extensions/external_provider_impl.cc index 8db4fb6..1a85f5f 100644 --- a/chrome/browser/extensions/external_provider_impl.cc +++ b/chrome/browser/extensions/external_provider_impl.cc @@ -123,7 +123,7 @@ void ExternalProviderImpl::SetPrefs(base::DictionaryValue* prefs) { } base::FilePath::StringType external_crx; - const Value* external_version_value = NULL; + const base::Value* external_version_value = NULL; std::string external_version; std::string external_update_url; @@ -131,7 +131,7 @@ void ExternalProviderImpl::SetPrefs(base::DictionaryValue* prefs) { bool has_external_version = false; if (extension->Get(kExternalVersion, &external_version_value)) { - if (external_version_value->IsType(Value::TYPE_STRING)) { + if (external_version_value->IsType(base::Value::TYPE_STRING)) { external_version_value->GetAsString(&external_version); has_external_version = true; } else { diff --git a/chrome/browser/extensions/external_registry_loader_win.cc b/chrome/browser/extensions/external_registry_loader_win.cc index 040869a..2d534d9 100644 --- a/chrome/browser/extensions/external_registry_loader_win.cc +++ b/chrome/browser/extensions/external_registry_loader_win.cc @@ -54,7 +54,7 @@ void ExternalRegistryLoader::StartLoading() { void ExternalRegistryLoader::LoadOnFileThread() { CHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); base::TimeTicks start_time = base::TimeTicks::Now(); - scoped_ptr<DictionaryValue> prefs(new DictionaryValue); + scoped_ptr<base::DictionaryValue> prefs(new base::DictionaryValue); // A map of IDs, to weed out duplicates between HKCU and HKLM. std::set<base::string16> keys; diff --git a/chrome/browser/extensions/image_loader_unittest.cc b/chrome/browser/extensions/image_loader_unittest.cc index 9b444b1..620448f 100644 --- a/chrome/browser/extensions/image_loader_unittest.cc +++ b/chrome/browser/extensions/image_loader_unittest.cc @@ -73,9 +73,9 @@ class ImageLoaderTest : public testing::Test { int error_code = 0; std::string error; JSONFileValueSerializer serializer(test_file.AppendASCII("app.json")); - scoped_ptr<DictionaryValue> valid_value( - static_cast<DictionaryValue*>(serializer.Deserialize(&error_code, - &error))); + scoped_ptr<base::DictionaryValue> valid_value( + static_cast<base::DictionaryValue*>(serializer.Deserialize(&error_code, + &error))); EXPECT_EQ(0, error_code) << error; if (error_code != 0) return NULL; diff --git a/chrome/browser/extensions/install_signer.cc b/chrome/browser/extensions/install_signer.cc index 50ab508..a50a240 100644 --- a/chrome/browser/extensions/install_signer.cc +++ b/chrome/browser/extensions/install_signer.cc @@ -155,7 +155,7 @@ scoped_ptr<InstallSignature> InstallSignature::FromValue( return result.Pass(); } - for (ListValue::const_iterator i = ids->begin(); i != ids->end(); ++i) { + for (base::ListValue::const_iterator i = ids->begin(); i != ids->end(); ++i) { std::string id; if (!(*i)->GetAsString(&id)) { result.reset(); @@ -289,7 +289,7 @@ void InstallSigner::GetSignature(const SignatureCallback& callback) { base::DictionaryValue dictionary; dictionary.SetInteger(kProtocolVersionKey, 1); dictionary.SetString(kHashKey, hash_base64); - scoped_ptr<ListValue> id_list(new ListValue); + scoped_ptr<base::ListValue> id_list(new base::ListValue); for (ExtensionIdSet::const_iterator i = ids_.begin(); i != ids_.end(); ++i) { id_list->AppendString(*i); } diff --git a/chrome/browser/extensions/install_verifier.cc b/chrome/browser/extensions/install_verifier.cc index 6d42824..995c945 100644 --- a/chrome/browser/extensions/install_verifier.cc +++ b/chrome/browser/extensions/install_verifier.cc @@ -105,7 +105,7 @@ InstallVerifier::InstallVerifier(ExtensionPrefs* prefs, InstallVerifier::~InstallVerifier() {} void InstallVerifier::Init() { - const DictionaryValue* pref = prefs_->GetInstallSignature(); + const base::DictionaryValue* pref = prefs_->GetInstallSignature(); if (pref) { scoped_ptr<InstallSignature> signature_from_prefs = InstallSignature::FromValue(*pref); @@ -332,7 +332,7 @@ void InstallVerifier::SaveToPrefs() { DVLOG(1) << "SaveToPrefs - saving NULL"; prefs_->SetInstallSignature(NULL); } else { - DictionaryValue pref; + base::DictionaryValue pref; signature_->ToValue(&pref); if (VLOG_IS_ON(1)) { DVLOG(1) << "SaveToPrefs - saving"; diff --git a/chrome/browser/extensions/installed_loader.cc b/chrome/browser/extensions/installed_loader.cc index 6b39ffb..2808367 100644 --- a/chrome/browser/extensions/installed_loader.cc +++ b/chrome/browser/extensions/installed_loader.cc @@ -73,7 +73,7 @@ enum ExternalItemState { EXTERNAL_ITEM_MAX_ITEMS = 8 }; -bool IsManifestCorrupt(const DictionaryValue* manifest) { +bool IsManifestCorrupt(const base::DictionaryValue* manifest) { if (!manifest) return false; @@ -81,8 +81,8 @@ bool IsManifestCorrupt(const DictionaryValue* manifest) { // file, one particularly bad case resulting in having both a background page // and background scripts values. In those situations we want to reload the // manifest from the extension to fix this. - const Value* background_page; - const Value* background_scripts; + const base::Value* background_page; + const base::Value* background_scripts; return manifest->Get(manifest_keys::kBackgroundPage, &background_page) && manifest->Get(manifest_keys::kBackgroundScripts, &background_scripts); } @@ -225,7 +225,7 @@ void InstalledLoader::LoadAllExtensions() { } extensions_info->at(i)->extension_manifest.reset( - static_cast<DictionaryValue*>( + static_cast<base::DictionaryValue*>( extension->manifest()->value()->DeepCopy())); should_write_prefs = true; } diff --git a/chrome/browser/extensions/menu_manager.cc b/chrome/browser/extensions/menu_manager.cc index 8300cb6..7223cad 100644 --- a/chrome/browser/extensions/menu_manager.cc +++ b/chrome/browser/extensions/menu_manager.cc @@ -90,10 +90,10 @@ scoped_ptr<base::Value> MenuItemsToValue(const MenuItem::List& items) { scoped_ptr<base::ListValue> list(new base::ListValue()); for (size_t i = 0; i < items.size(); ++i) list->Append(items[i]->ToValue().release()); - return scoped_ptr<Value>(list.release()); + return scoped_ptr<base::Value>(list.release()); } -bool GetStringList(const DictionaryValue& dict, +bool GetStringList(const base::DictionaryValue& dict, const std::string& key, std::vector<std::string>* out) { if (!dict.HasKey(key)) @@ -191,8 +191,8 @@ void MenuItem::AddChild(MenuItem* item) { children_.push_back(item); } -scoped_ptr<DictionaryValue> MenuItem::ToValue() const { - scoped_ptr<DictionaryValue> value(new DictionaryValue); +scoped_ptr<base::DictionaryValue> MenuItem::ToValue() const { + scoped_ptr<base::DictionaryValue> value(new base::DictionaryValue); // Should only be called for extensions with event pages, which only have // string IDs for items. DCHECK_EQ(0, id_.uid); @@ -217,7 +217,7 @@ scoped_ptr<DictionaryValue> MenuItem::ToValue() const { // static MenuItem* MenuItem::Populate(const std::string& extension_id, - const DictionaryValue& value, + const base::DictionaryValue& value, std::string* error) { bool incognito = false; if (!value.GetBoolean(kIncognitoKey, &incognito)) @@ -242,7 +242,7 @@ MenuItem* MenuItem::Populate(const std::string& extension_id, if (!value.GetBoolean(kEnabledKey, &enabled)) return NULL; ContextList contexts; - const Value* contexts_value = NULL; + const base::Value* contexts_value = NULL; if (!value.Get(kContextsKey, &contexts_value)) return NULL; if (!contexts.Populate(*contexts_value)) @@ -588,7 +588,7 @@ void MenuManager::RadioItemSelected(MenuItem* item) { } } -static void AddURLProperty(DictionaryValue* dictionary, +static void AddURLProperty(base::DictionaryValue* dictionary, const std::string& key, const GURL& url) { if (!url.is_empty()) dictionary->SetString(key, url.possibly_invalid_spec()); @@ -618,7 +618,7 @@ void MenuManager::ExecuteCommand(Profile* profile, scoped_ptr<base::ListValue> args(new base::ListValue()); - DictionaryValue* properties = new DictionaryValue(); + base::DictionaryValue* properties = new base::DictionaryValue(); SetIdKeyValue(properties, "menuItemId", item->id()); if (item->parent_id()) SetIdKeyValue(properties, "parentMenuItemId", *item->parent_id()); @@ -655,7 +655,7 @@ void MenuManager::ExecuteCommand(Profile* profile, if (web_contents) { args->Append(ExtensionTabUtil::CreateTabValue(web_contents)); } else { - args->Append(new DictionaryValue()); + args->Append(new base::DictionaryValue()); } } diff --git a/chrome/browser/extensions/menu_manager_unittest.cc b/chrome/browser/extensions/menu_manager_unittest.cc index ea2056e..70dafe9 100644 --- a/chrome/browser/extensions/menu_manager_unittest.cc +++ b/chrome/browser/extensions/menu_manager_unittest.cc @@ -603,7 +603,7 @@ TEST_F(MenuManagerTest, ExecuteCommand) { ASSERT_EQ(2u, list->GetSize()); - DictionaryValue* info; + base::DictionaryValue* info; ASSERT_TRUE(list->GetDictionary(0, &info)); int tmp_id = 0; diff --git a/chrome/browser/extensions/policy_handlers.cc b/chrome/browser/extensions/policy_handlers.cc index 005fdc2..21ee3ac 100644 --- a/chrome/browser/extensions/policy_handlers.cc +++ b/chrome/browser/extensions/policy_handlers.cc @@ -239,7 +239,7 @@ void ExtensionURLPatternListPolicyHandler::ApplyPolicySettings( PrefValueMap* prefs) { if (!pref_path_) return; - const Value* value = policies.GetValue(policy_name()); + const base::Value* value = policies.GetValue(policy_name()); if (value) prefs->SetValue(pref_path_, value->DeepCopy()); } diff --git a/chrome/browser/extensions/policy_handlers_unittest.cc b/chrome/browser/extensions/policy_handlers_unittest.cc index 270b2ff..8cbd467 100644 --- a/chrome/browser/extensions/policy_handlers_unittest.cc +++ b/chrome/browser/extensions/policy_handlers_unittest.cc @@ -31,7 +31,8 @@ TEST(ExtensionListPolicyHandlerTest, CheckPolicySettings) { EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors)); EXPECT_TRUE(errors.empty()); - list.Append(Value::CreateStringValue("abcdefghijklmnopabcdefghijklmnop")); + list.Append( + base::Value::CreateStringValue("abcdefghijklmnopabcdefghijklmnop")); policy_map.Set(policy::key::kExtensionInstallBlacklist, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, @@ -41,7 +42,7 @@ TEST(ExtensionListPolicyHandlerTest, CheckPolicySettings) { EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors)); EXPECT_TRUE(errors.empty()); - list.Append(Value::CreateStringValue("*")); + list.Append(base::Value::CreateStringValue("*")); policy_map.Set(policy::key::kExtensionInstallBlacklist, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, @@ -51,7 +52,7 @@ TEST(ExtensionListPolicyHandlerTest, CheckPolicySettings) { EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors)); EXPECT_TRUE(errors.empty()); - list.Append(Value::CreateStringValue("invalid")); + list.Append(base::Value::CreateStringValue("invalid")); policy_map.Set(policy::key::kExtensionInstallBlacklist, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, @@ -73,8 +74,10 @@ TEST(ExtensionListPolicyHandlerTest, ApplyPolicySettings) { ExtensionListPolicyHandler handler( policy::key::kExtensionInstallBlacklist, kTestPref, false); - policy.Append(Value::CreateStringValue("abcdefghijklmnopabcdefghijklmnop")); - expected.Append(Value::CreateStringValue("abcdefghijklmnopabcdefghijklmnop")); + policy.Append( + base::Value::CreateStringValue("abcdefghijklmnopabcdefghijklmnop")); + expected.Append( + base::Value::CreateStringValue("abcdefghijklmnopabcdefghijklmnop")); policy_map.Set(policy::key::kExtensionInstallBlacklist, policy::POLICY_LEVEL_MANDATORY, @@ -85,7 +88,7 @@ TEST(ExtensionListPolicyHandlerTest, ApplyPolicySettings) { EXPECT_TRUE(prefs.GetValue(kTestPref, &value)); EXPECT_TRUE(base::Value::Equals(&expected, value)); - policy.Append(Value::CreateStringValue("invalid")); + policy.Append(base::Value::CreateStringValue("invalid")); policy_map.Set(policy::key::kExtensionInstallBlacklist, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, @@ -216,7 +219,7 @@ TEST(ExtensionURLPatternListPolicyHandlerTest, CheckPolicySettings) { EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors)); EXPECT_TRUE(errors.empty()); - list.Append(Value::CreateStringValue("http://*.google.com/*")); + list.Append(base::Value::CreateStringValue("http://*.google.com/*")); policy_map.Set(policy::key::kExtensionInstallSources, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, @@ -226,7 +229,7 @@ TEST(ExtensionURLPatternListPolicyHandlerTest, CheckPolicySettings) { EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors)); EXPECT_TRUE(errors.empty()); - list.Append(Value::CreateStringValue("<all_urls>")); + list.Append(base::Value::CreateStringValue("<all_urls>")); policy_map.Set(policy::key::kExtensionInstallSources, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, @@ -236,7 +239,7 @@ TEST(ExtensionURLPatternListPolicyHandlerTest, CheckPolicySettings) { EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors)); EXPECT_TRUE(errors.empty()); - list.Append(Value::CreateStringValue("invalid")); + list.Append(base::Value::CreateStringValue("invalid")); policy_map.Set(policy::key::kExtensionInstallSources, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, @@ -249,7 +252,7 @@ TEST(ExtensionURLPatternListPolicyHandlerTest, CheckPolicySettings) { // URLPattern syntax has a different way to express 'all urls'. Though '*' // would be compatible today, it would be brittle, so we disallow. - list.Append(Value::CreateStringValue("*")); + list.Append(base::Value::CreateStringValue("*")); policy_map.Set(policy::key::kExtensionInstallSources, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, @@ -269,7 +272,7 @@ TEST(ExtensionURLPatternListPolicyHandlerTest, ApplyPolicySettings) { ExtensionURLPatternListPolicyHandler handler( policy::key::kExtensionInstallSources, kTestPref); - list.Append(Value::CreateStringValue("https://corp.monkey.net/*")); + list.Append(base::Value::CreateStringValue("https://corp.monkey.net/*")); policy_map.Set(policy::key::kExtensionInstallSources, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, diff --git a/chrome/browser/extensions/sandboxed_unpacker.cc b/chrome/browser/extensions/sandboxed_unpacker.cc index 1f96441..eb264fd 100644 --- a/chrome/browser/extensions/sandboxed_unpacker.cc +++ b/chrome/browser/extensions/sandboxed_unpacker.cc @@ -354,11 +354,12 @@ void SandboxedUnpacker::StartProcessOnIOThread( } void SandboxedUnpacker::OnUnpackExtensionSucceeded( - const DictionaryValue& manifest) { + const base::DictionaryValue& manifest) { CHECK(unpacker_io_task_runner_->RunsTasksOnCurrentThread()); got_response_ = true; - scoped_ptr<DictionaryValue> final_manifest(RewriteManifestFile(manifest)); + scoped_ptr<base::DictionaryValue> final_manifest( + RewriteManifestFile(manifest)); if (!final_manifest) return; @@ -589,7 +590,7 @@ void SandboxedUnpacker::ReportFailure(FailureReason reason, } void SandboxedUnpacker::ReportSuccess( - const DictionaryValue& original_manifest, + const base::DictionaryValue& original_manifest, const SkBitmap& install_icon) { UMA_HISTOGRAM_COUNTS("Extensions.SandboxUnpackSuccess", 1); @@ -603,12 +604,12 @@ void SandboxedUnpacker::ReportSuccess( extension_ = NULL; } -DictionaryValue* SandboxedUnpacker::RewriteManifestFile( - const DictionaryValue& manifest) { +base::DictionaryValue* SandboxedUnpacker::RewriteManifestFile( + const base::DictionaryValue& manifest) { // Add the public key extracted earlier to the parsed manifest and overwrite // the original manifest. We do this to ensure the manifest doesn't contain an // exploitable bug that could be used to compromise the browser. - scoped_ptr<DictionaryValue> final_manifest(manifest.DeepCopy()); + scoped_ptr<base::DictionaryValue> final_manifest(manifest.DeepCopy()); final_manifest->SetString(manifest_keys::kPublicKey, public_key_); std::string manifest_json; @@ -755,7 +756,7 @@ bool SandboxedUnpacker::RewriteImageFiles(SkBitmap* install_icon) { } bool SandboxedUnpacker::RewriteCatalogFiles() { - DictionaryValue catalogs; + base::DictionaryValue catalogs; if (!ReadMessageCatalogsFromFile(temp_dir_.path(), &catalogs)) { // Could not read catalog data from disk. ReportFailure( @@ -767,8 +768,9 @@ bool SandboxedUnpacker::RewriteCatalogFiles() { } // Write our parsed catalogs back to disk. - for (DictionaryValue::Iterator it(catalogs); !it.IsAtEnd(); it.Advance()) { - const DictionaryValue* catalog = NULL; + for (base::DictionaryValue::Iterator it(catalogs); + !it.IsAtEnd(); it.Advance()) { + const base::DictionaryValue* catalog = NULL; if (!it.value().GetAsDictionary(&catalog)) { // Invalid catalog data. ReportFailure( diff --git a/chrome/browser/extensions/test_extension_prefs.cc b/chrome/browser/extensions/test_extension_prefs.cc index c14320c..e129bc0 100644 --- a/chrome/browser/extensions/test_extension_prefs.cc +++ b/chrome/browser/extensions/test_extension_prefs.cc @@ -123,14 +123,14 @@ void TestExtensionPrefs::RecreateExtensionPrefs() { } scoped_refptr<Extension> TestExtensionPrefs::AddExtension(std::string name) { - DictionaryValue dictionary; + base::DictionaryValue dictionary; dictionary.SetString(manifest_keys::kName, name); dictionary.SetString(manifest_keys::kVersion, "0.1"); return AddExtensionWithManifest(dictionary, Manifest::INTERNAL); } scoped_refptr<Extension> TestExtensionPrefs::AddApp(std::string name) { - DictionaryValue dictionary; + base::DictionaryValue dictionary; dictionary.SetString(manifest_keys::kName, name); dictionary.SetString(manifest_keys::kVersion, "0.1"); dictionary.SetString(manifest_keys::kApp, "true"); @@ -140,13 +140,13 @@ scoped_refptr<Extension> TestExtensionPrefs::AddApp(std::string name) { } scoped_refptr<Extension> TestExtensionPrefs::AddExtensionWithManifest( - const DictionaryValue& manifest, Manifest::Location location) { + const base::DictionaryValue& manifest, Manifest::Location location) { return AddExtensionWithManifestAndFlags(manifest, location, Extension::NO_FLAGS); } scoped_refptr<Extension> TestExtensionPrefs::AddExtensionWithManifestAndFlags( - const DictionaryValue& manifest, + const base::DictionaryValue& manifest, Manifest::Location location, int extra_flags) { std::string name; diff --git a/chrome/browser/extensions/updater/extension_updater_unittest.cc b/chrome/browser/extensions/updater/extension_updater_unittest.cc index d7e963f..43fadaa 100644 --- a/chrome/browser/extensions/updater/extension_updater_unittest.cc +++ b/chrome/browser/extensions/updater/extension_updater_unittest.cc @@ -259,7 +259,7 @@ class MockService : public TestExtensionService { const std::string* update_url, Manifest::Location location) { for (int i = 1; i <= count; i++) { - DictionaryValue manifest; + base::DictionaryValue manifest; manifest.SetString(manifest_keys::kVersion, base::StringPrintf("%d.0.0.0", i)); manifest.SetString(manifest_keys::kName, diff --git a/chrome/browser/extensions/user_script_listener_unittest.cc b/chrome/browser/extensions/user_script_listener_unittest.cc index 0e530d4..34c31f4 100644 --- a/chrome/browser/extensions/user_script_listener_unittest.cc +++ b/chrome/browser/extensions/user_script_listener_unittest.cc @@ -78,11 +78,12 @@ class SimpleTestJob : public net::URLRequestTestJob { }; // Yoinked from extension_manifest_unittest.cc. -DictionaryValue* LoadManifestFile(const base::FilePath path, - std::string* error) { +base::DictionaryValue* LoadManifestFile(const base::FilePath path, + std::string* error) { EXPECT_TRUE(base::PathExists(path)); JSONFileValueSerializer serializer(path); - return static_cast<DictionaryValue*>(serializer.Deserialize(NULL, error)); + return static_cast<base::DictionaryValue*>( + serializer.Deserialize(NULL, error)); } scoped_refptr<Extension> LoadExtension(const std::string& filename, @@ -93,7 +94,7 @@ scoped_refptr<Extension> LoadExtension(const std::string& filename, AppendASCII("extensions"). AppendASCII("manifest_tests"). AppendASCII(filename.c_str()); - scoped_ptr<DictionaryValue> value(LoadManifestFile(path, error)); + scoped_ptr<base::DictionaryValue> value(LoadManifestFile(path, error)); if (!value) return NULL; return Extension::Create(path.DirName(), Manifest::UNPACKED, *value, diff --git a/chrome/browser/extensions/webstore_install_helper.cc b/chrome/browser/extensions/webstore_install_helper.cc index d105da6..7fd0974 100644 --- a/chrome/browser/extensions/webstore_install_helper.cc +++ b/chrome/browser/extensions/webstore_install_helper.cc @@ -152,11 +152,11 @@ void WebstoreInstallHelper::OnJSONParseSucceeded( const base::ListValue& wrapper) { CHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); manifest_parse_complete_ = true; - const Value* value = NULL; + const base::Value* value = NULL; CHECK(wrapper.Get(0, &value)); - if (value->IsType(Value::TYPE_DICTIONARY)) { + if (value->IsType(base::Value::TYPE_DICTIONARY)) { parsed_manifest_.reset( - static_cast<const DictionaryValue*>(value)->DeepCopy()); + static_cast<const base::DictionaryValue*>(value)->DeepCopy()); } else { parse_error_ = Delegate::MANIFEST_ERROR; } diff --git a/chrome/browser/extensions/webstore_installer.cc b/chrome/browser/extensions/webstore_installer.cc index 4c7ffff..3bccff5 100644 --- a/chrome/browser/extensions/webstore_installer.cc +++ b/chrome/browser/extensions/webstore_installer.cc @@ -227,7 +227,8 @@ WebstoreInstaller::Approval::CreateWithNoInstallPrompt( result->profile = profile; result->manifest = scoped_ptr<Manifest>( new Manifest(Manifest::INVALID_LOCATION, - scoped_ptr<DictionaryValue>(parsed_manifest->DeepCopy()))); + scoped_ptr<base::DictionaryValue>( + parsed_manifest->DeepCopy()))); result->skip_install_dialog = true; result->manifest_check_level = strict_manifest_check ? MANIFEST_CHECK_LEVEL_STRICT : MANIFEST_CHECK_LEVEL_LOOSE; diff --git a/chrome/browser/extensions/webstore_standalone_installer.cc b/chrome/browser/extensions/webstore_standalone_installer.cc index 31dc1ac..731c145 100644 --- a/chrome/browser/extensions/webstore_standalone_installer.cc +++ b/chrome/browser/extensions/webstore_standalone_installer.cc @@ -107,7 +107,7 @@ void WebstoreStandaloneInstaller::OnWebstoreRequestFailure() { } void WebstoreStandaloneInstaller::OnWebstoreResponseParseSuccess( - scoped_ptr<DictionaryValue> webstore_data) { + scoped_ptr<base::DictionaryValue> webstore_data) { if (!CheckRequestorAlive()) { CompleteInstall(std::string()); return; diff --git a/chrome/browser/extensions/webstore_standalone_installer.h b/chrome/browser/extensions/webstore_standalone_installer.h index a713f1d..b515cb0 100644 --- a/chrome/browser/extensions/webstore_standalone_installer.h +++ b/chrome/browser/extensions/webstore_standalone_installer.h @@ -135,7 +135,7 @@ class WebstoreStandaloneInstaller } Profile* profile() const { return profile_; } const std::string& id() const { return id_; } - const DictionaryValue* manifest() const { return manifest_.get(); } + const base::DictionaryValue* manifest() const { return manifest_.get(); } private: friend class base::RefCountedThreadSafe<WebstoreStandaloneInstaller>; @@ -206,8 +206,8 @@ class WebstoreStandaloneInstaller std::string localized_user_count_; double average_rating_; int rating_count_; - scoped_ptr<DictionaryValue> webstore_data_; - scoped_ptr<DictionaryValue> manifest_; + scoped_ptr<base::DictionaryValue> webstore_data_; + scoped_ptr<base::DictionaryValue> manifest_; SkBitmap icon_; // Created by ShowInstallUI() when a prompt is shown (if diff --git a/chrome/browser/extensions/window_controller.cc b/chrome/browser/extensions/window_controller.cc index 9709c3f..cab2495 100644 --- a/chrome/browser/extensions/window_controller.cc +++ b/chrome/browser/extensions/window_controller.cc @@ -30,7 +30,7 @@ Browser* WindowController::GetBrowser() const { namespace keys = tabs_constants; base::DictionaryValue* WindowController::CreateWindowValue() const { - DictionaryValue* result = new DictionaryValue(); + base::DictionaryValue* result = new base::DictionaryValue(); result->SetInteger(keys::kIdKey, GetWindowId()); result->SetString(keys::kWindowTypeKey, GetWindowTypeText()); diff --git a/chrome/browser/external_protocol/external_protocol_handler.cc b/chrome/browser/external_protocol/external_protocol_handler.cc index 291652d..752949a 100644 --- a/chrome/browser/external_protocol/external_protocol_handler.cc +++ b/chrome/browser/external_protocol/external_protocol_handler.cc @@ -148,7 +148,8 @@ class ExternalDefaultProtocolObserver } // namespace // static -void ExternalProtocolHandler::PrepopulateDictionary(DictionaryValue* win_pref) { +void ExternalProtocolHandler::PrepopulateDictionary( + base::DictionaryValue* win_pref) { static bool is_warm = false; if (is_warm) return; diff --git a/chrome/browser/first_run/first_run.cc b/chrome/browser/first_run/first_run.cc index 20a4392..5201512 100644 --- a/chrome/browser/first_run/first_run.cc +++ b/chrome/browser/first_run/first_run.cc @@ -162,7 +162,7 @@ void DoDelayedInstallExtensions() { void DoDelayedInstallExtensionsIfNeeded( installer::MasterPreferences* install_prefs) { - DictionaryValue* extensions = 0; + base::DictionaryValue* extensions = 0; if (install_prefs->GetExtensionsBlock(&extensions)) { VLOG(1) << "Extensions block found in master preferences"; DoDelayedInstallExtensions(); diff --git a/chrome/browser/geolocation/chrome_access_token_store.cc b/chrome/browser/geolocation/chrome_access_token_store.cc index 1db095d..8b72425 100644 --- a/chrome/browser/geolocation/chrome_access_token_store.cc +++ b/chrome/browser/geolocation/chrome_access_token_store.cc @@ -62,12 +62,12 @@ class TokenLoadingJob : public base::RefCountedThreadSafe<TokenLoadingJob> { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); DictionaryPrefUpdate update(g_browser_process->local_state(), prefs::kGeolocationAccessToken); - DictionaryValue* token_dictionary = update.Get(); + base::DictionaryValue* token_dictionary = update.Get(); std::vector<std::string> providers_to_remove; // The dictionary value could be NULL if the pref has never been set. if (token_dictionary != NULL) { - for (DictionaryValue::Iterator it(*token_dictionary); !it.IsAtEnd(); + for (base::DictionaryValue::Iterator it(*token_dictionary); !it.IsAtEnd(); it.Advance()) { GURL url(it.key()); if (!url.is_valid()) @@ -117,9 +117,9 @@ static void SetAccessTokenOnUIThread(const GURL& server_url, DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); DictionaryPrefUpdate update(g_browser_process->local_state(), prefs::kGeolocationAccessToken); - DictionaryValue* access_token_dictionary = update.Get(); + base::DictionaryValue* access_token_dictionary = update.Get(); access_token_dictionary->SetWithoutPathExpansion( - server_url.spec(), Value::CreateStringValue(token)); + server_url.spec(), base::Value::CreateStringValue(token)); } void ChromeAccessTokenStore::SaveAccessToken( diff --git a/chrome/browser/guestview/adview/adview_guest.cc b/chrome/browser/guestview/adview/adview_guest.cc index cb79be2..6b0de6f 100644 --- a/chrome/browser/guestview/adview/adview_guest.cc +++ b/chrome/browser/guestview/adview/adview_guest.cc @@ -49,7 +49,7 @@ void AdViewGuest::DidCommitProvisionalLoadForFrame( const GURL& url, content::PageTransition transition_type, content::RenderViewHost* render_view_host) { - scoped_ptr<DictionaryValue> args(new DictionaryValue()); + scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue()); args->SetString(guestview::kUrl, url.spec()); args->SetBoolean(guestview::kIsTopLevel, is_main_frame); DispatchEvent(new GuestView::Event(adview::kEventLoadCommit, args.Pass())); @@ -67,7 +67,7 @@ void AdViewGuest::DidFailProvisionalLoad( std::string error_type; base::RemoveChars(net::ErrorToString(error_code), "net::", &error_type); - scoped_ptr<DictionaryValue> args(new DictionaryValue()); + scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue()); args->SetBoolean(guestview::kIsTopLevel, is_main_frame); args->SetString(guestview::kUrl, validated_url.spec()); args->SetString(guestview::kReason, error_type); diff --git a/chrome/browser/guestview/guestview.cc b/chrome/browser/guestview/guestview.cc index eca6aea..ecf5991 100644 --- a/chrome/browser/guestview/guestview.cc +++ b/chrome/browser/guestview/guestview.cc @@ -32,7 +32,7 @@ static base::LazyInstance<WebContentsGuestViewMap> webcontents_guestview_map = } // namespace GuestView::Event::Event(const std::string& name, - scoped_ptr<DictionaryValue> args) + scoped_ptr<base::DictionaryValue> args) : name_(name), args_(args.Pass()) { } @@ -40,7 +40,7 @@ GuestView::Event::Event(const std::string& name, GuestView::Event::~Event() { } -scoped_ptr<DictionaryValue> GuestView::Event::GetArguments() { +scoped_ptr<base::DictionaryValue> GuestView::Event::GetArguments() { return args_.Pass(); } @@ -195,7 +195,7 @@ void GuestView::DispatchEvent(Event* event) { extensions::EventFilteringInfo info; info.SetURL(GURL()); info.SetInstanceID(guest_instance_id_); - scoped_ptr<ListValue> args(new ListValue()); + scoped_ptr<base::ListValue> args(new base::ListValue()); args->Append(event->GetArguments().release()); extensions::EventRouter::DispatchEvent( diff --git a/chrome/browser/guestview/guestview.h b/chrome/browser/guestview/guestview.h index 8b6e03b..46485840 100644 --- a/chrome/browser/guestview/guestview.h +++ b/chrome/browser/guestview/guestview.h @@ -29,16 +29,16 @@ class GuestView : public content::BrowserPluginGuestDelegate { class Event { public: - Event(const std::string& name, scoped_ptr<DictionaryValue> args); + Event(const std::string& name, scoped_ptr<base::DictionaryValue> args); ~Event(); const std::string& name() const { return name_; } - scoped_ptr<DictionaryValue> GetArguments(); + scoped_ptr<base::DictionaryValue> GetArguments(); private: const std::string name_; - scoped_ptr<DictionaryValue> args_; + scoped_ptr<base::DictionaryValue> args_; }; static Type GetViewTypeFromString(const std::string& api_type); diff --git a/chrome/browser/guestview/webview/webview_guest.cc b/chrome/browser/guestview/webview/webview_guest.cc index bf24ddd..9a99061 100644 --- a/chrome/browser/guestview/webview/webview_guest.cc +++ b/chrome/browser/guestview/webview/webview_guest.cc @@ -272,7 +272,7 @@ void WebViewGuest::AddMessageToConsole(int32 level, const base::string16& message, int32 line_no, const base::string16& source_id) { - scoped_ptr<DictionaryValue> args(new DictionaryValue()); + scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue()); // Log levels are from base/logging.h: LogSeverity. args->SetInteger(webview::kLevel, level); args->SetString(webview::kMessage, message); @@ -283,7 +283,7 @@ void WebViewGuest::AddMessageToConsole(int32 level, } void WebViewGuest::Close() { - scoped_ptr<DictionaryValue> args(new DictionaryValue()); + scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue()); DispatchEvent(new GuestView::Event(webview::kEventClose, args.Pass())); } @@ -313,7 +313,7 @@ void WebViewGuest::EmbedderDestroyed() { } void WebViewGuest::GuestProcessGone(base::TerminationStatus status) { - scoped_ptr<DictionaryValue> args(new DictionaryValue()); + scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue()); args->SetInteger(webview::kProcessId, web_contents()->GetRenderProcessHost()->GetID()); args->SetString(webview::kReason, TerminationStatusToString(status)); @@ -374,7 +374,7 @@ bool WebViewGuest::IsOverridingUserAgent() const { } void WebViewGuest::LoadProgressed(double progress) { - scoped_ptr<DictionaryValue> args(new DictionaryValue()); + scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue()); args->SetString(guestview::kUrl, web_contents()->GetURL().spec()); args->SetDouble(webview::kProgress, progress); DispatchEvent(new GuestView::Event(webview::kEventLoadProgress, args.Pass())); @@ -383,7 +383,7 @@ void WebViewGuest::LoadProgressed(double progress) { void WebViewGuest::LoadAbort(bool is_top_level, const GURL& url, const std::string& error_type) { - scoped_ptr<DictionaryValue> args(new DictionaryValue()); + scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue()); args->SetBoolean(guestview::kIsTopLevel, is_top_level); args->SetString(guestview::kUrl, url.possibly_invalid_spec()); args->SetString(guestview::kReason, error_type); @@ -393,14 +393,14 @@ void WebViewGuest::LoadAbort(bool is_top_level, // TODO(fsamuel): Find a reliable way to test the 'responsive' and // 'unresponsive' events. void WebViewGuest::RendererResponsive() { - scoped_ptr<DictionaryValue> args(new DictionaryValue()); + scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue()); args->SetInteger(webview::kProcessId, guest_web_contents()->GetRenderProcessHost()->GetID()); DispatchEvent(new GuestView::Event(webview::kEventResponsive, args.Pass())); } void WebViewGuest::RendererUnresponsive() { - scoped_ptr<DictionaryValue> args(new DictionaryValue()); + scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue()); args->SetInteger(webview::kProcessId, guest_web_contents()->GetRenderProcessHost()->GetID()); DispatchEvent(new GuestView::Event(webview::kEventUnresponsive, args.Pass())); @@ -570,7 +570,7 @@ void WebViewGuest::DidCommitProvisionalLoadForFrame( const GURL& url, content::PageTransition transition_type, content::RenderViewHost* render_view_host) { - scoped_ptr<DictionaryValue> args(new DictionaryValue()); + scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue()); args->SetString(guestview::kUrl, url.spec()); args->SetBoolean(guestview::kIsTopLevel, is_main_frame); args->SetInteger(webview::kInternalCurrentEntryIndex, @@ -604,14 +604,14 @@ void WebViewGuest::DidStartProvisionalLoadForFrame( bool is_error_page, bool is_iframe_srcdoc, content::RenderViewHost* render_view_host) { - scoped_ptr<DictionaryValue> args(new DictionaryValue()); + scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue()); args->SetString(guestview::kUrl, validated_url.spec()); args->SetBoolean(guestview::kIsTopLevel, is_main_frame); DispatchEvent(new GuestView::Event(webview::kEventLoadStart, args.Pass())); } void WebViewGuest::DidStopLoading(content::RenderViewHost* render_view_host) { - scoped_ptr<DictionaryValue> args(new DictionaryValue()); + scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue()); DispatchEvent(new GuestView::Event(webview::kEventLoadStop, args.Pass())); } @@ -636,14 +636,14 @@ void WebViewGuest::UserAgentOverrideSet(const std::string& user_agent) { } void WebViewGuest::LoadHandlerCalled() { - scoped_ptr<DictionaryValue> args(new DictionaryValue()); + scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue()); DispatchEvent(new GuestView::Event(webview::kEventContentLoad, args.Pass())); } void WebViewGuest::LoadRedirect(const GURL& old_url, const GURL& new_url, bool is_top_level) { - scoped_ptr<DictionaryValue> args(new DictionaryValue()); + scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue()); args->SetBoolean(guestview::kIsTopLevel, is_top_level); args->SetString(webview::kNewURL, new_url.spec()); args->SetString(webview::kOldURL, old_url.spec()); @@ -715,7 +715,7 @@ GURL WebViewGuest::ResolveURL(const std::string& src) { void WebViewGuest::SizeChanged(const gfx::Size& old_size, const gfx::Size& new_size) { - scoped_ptr<DictionaryValue> args(new DictionaryValue()); + scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue()); args->SetInteger(webview::kOldHeight, old_size.height()); args->SetInteger(webview::kOldWidth, old_size.width()); args->SetInteger(webview::kNewHeight, new_size.height()); diff --git a/chrome/browser/history/most_visited_tiles_experiment_unittest.cc b/chrome/browser/history/most_visited_tiles_experiment_unittest.cc index ccaee6f..309d0f01 100644 --- a/chrome/browser/history/most_visited_tiles_experiment_unittest.cc +++ b/chrome/browser/history/most_visited_tiles_experiment_unittest.cc @@ -46,7 +46,7 @@ enum FlippedIndexes { // Creates a DictionaryValue using |url| and appends to |list|. void AppendURLToListValue(const std::string& url_string, base::ListValue* list) { - DictionaryValue* page_value = new DictionaryValue(); + base::DictionaryValue* page_value = new base::DictionaryValue(); page_value->SetString("url", url_string); list->Append(page_value); } @@ -160,7 +160,7 @@ TEST_F(MostVisitedTilesExperimentTest, // Test the method when there are not enough URLs to force removal. MostVisitedTilesExperiment::RemovePageValuesMatchingOpenTabs( open_urls, &pages_value); - DictionaryValue gmail_value; + base::DictionaryValue gmail_value; gmail_value.SetString("url", kGmailURL); // Ensure the open url has not been removed from |pages_value|. EXPECT_NE(pages_value.end(), pages_value.Find(gmail_value)); @@ -196,7 +196,7 @@ TEST_F(MostVisitedTilesExperimentTest, RemovePageValuesMatchingOpenTabs) { MostVisitedTilesExperiment::RemovePageValuesMatchingOpenTabs( open_urls, &pages_value); // Ensure the open url has been removed from |pages_value|. - DictionaryValue gmail_value; + base::DictionaryValue gmail_value; gmail_value.SetString("url", kGmailURL); EXPECT_EQ(pages_value.end(), pages_value.Find(gmail_value)); diff --git a/chrome/browser/history/top_sites_impl.cc b/chrome/browser/history/top_sites_impl.cc index 40f78fc..f76d0b6 100644 --- a/chrome/browser/history/top_sites_impl.cc +++ b/chrome/browser/history/top_sites_impl.cc @@ -325,7 +325,7 @@ void TopSitesImpl::SyncWithHistory() { } bool TopSitesImpl::HasBlacklistedItems() const { - const DictionaryValue* blacklist = + const base::DictionaryValue* blacklist = profile_->GetPrefs()->GetDictionary(prefs::kNtpMostVisitedURLsBlacklist); return blacklist && !blacklist->empty(); } @@ -333,11 +333,11 @@ bool TopSitesImpl::HasBlacklistedItems() const { void TopSitesImpl::AddBlacklistedURL(const GURL& url) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); - Value* dummy = Value::CreateNullValue(); + base::Value* dummy = base::Value::CreateNullValue(); { DictionaryPrefUpdate update(profile_->GetPrefs(), prefs::kNtpMostVisitedURLsBlacklist); - DictionaryValue* blacklist = update.Get(); + base::DictionaryValue* blacklist = update.Get(); blacklist->SetWithoutPathExpansion(GetURLHash(url), dummy); } @@ -350,7 +350,7 @@ void TopSitesImpl::RemoveBlacklistedURL(const GURL& url) { { DictionaryPrefUpdate update(profile_->GetPrefs(), prefs::kNtpMostVisitedURLsBlacklist); - DictionaryValue* blacklist = update.Get(); + base::DictionaryValue* blacklist = update.Get(); blacklist->RemoveWithoutPathExpansion(GetURLHash(url), NULL); } ResetThreadSafeCache(); @@ -359,7 +359,7 @@ void TopSitesImpl::RemoveBlacklistedURL(const GURL& url) { bool TopSitesImpl::IsBlacklisted(const GURL& url) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); - const DictionaryValue* blacklist = + const base::DictionaryValue* blacklist = profile_->GetPrefs()->GetDictionary(prefs::kNtpMostVisitedURLsBlacklist); return blacklist && blacklist->HasKey(GetURLHash(url)); } @@ -369,7 +369,7 @@ void TopSitesImpl::ClearBlacklistedURLs() { { DictionaryPrefUpdate update(profile_->GetPrefs(), prefs::kNtpMostVisitedURLsBlacklist); - DictionaryValue* blacklist = update.Get(); + base::DictionaryValue* blacklist = update.Get(); blacklist->Clear(); } ResetThreadSafeCache(); @@ -696,7 +696,7 @@ void TopSitesImpl::ApplyBlacklist(const MostVisitedURLList& urls, MostVisitedURLList* out) { // Log the number of times ApplyBlacklist is called so we can compute the // average number of blacklisted items per user. - const DictionaryValue* blacklist = + const base::DictionaryValue* blacklist = profile_->GetPrefs()->GetDictionary(prefs::kNtpMostVisitedURLsBlacklist); UMA_HISTOGRAM_BOOLEAN("TopSites.NumberOfApplyBlacklist", true); UMA_HISTOGRAM_COUNTS_100("TopSites.NumberOfBlacklistedItems", @@ -841,7 +841,7 @@ void TopSitesImpl::SetTopSites(const MostVisitedURLList& new_top_sites) { int TopSitesImpl::num_results_to_request_from_history() const { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); - const DictionaryValue* blacklist = + const base::DictionaryValue* blacklist = profile_->GetPrefs()->GetDictionary(prefs::kNtpMostVisitedURLsBlacklist); return kNonForcedTopSitesNumber + (blacklist ? blacklist->size() : 0); } diff --git a/chrome/browser/history/web_history_service.cc b/chrome/browser/history/web_history_service.cc index a96fb25..c88bd8f7 100644 --- a/chrome/browser/history/web_history_service.cc +++ b/chrome/browser/history/web_history_service.cc @@ -206,12 +206,12 @@ class RequestImpl : public WebHistoryService::Request, // Extracts a JSON-encoded HTTP response into a DictionaryValue. // If |request|'s HTTP response code indicates failure, or if the response // body is not JSON, a null pointer is returned. -scoped_ptr<DictionaryValue> ReadResponse(RequestImpl* request) { - scoped_ptr<DictionaryValue> result; +scoped_ptr<base::DictionaryValue> ReadResponse(RequestImpl* request) { + scoped_ptr<base::DictionaryValue> result; if (request->response_code() == net::HTTP_OK) { - Value* value = base::JSONReader::Read(request->response_body()); + base::Value* value = base::JSONReader::Read(request->response_body()); if (value && value->IsType(base::Value::TYPE_DICTIONARY)) - result.reset(static_cast<DictionaryValue*>(value)); + result.reset(static_cast<base::DictionaryValue*>(value)); else DLOG(WARNING) << "Non-JSON response received from history server."; } @@ -269,11 +269,11 @@ GURL GetQueryUrl(const base::string16& text_query, // Creates a DictionaryValue to hold the parameters for a deletion. // Ownership is passed to the caller. // |url| may be empty, indicating a time-range deletion. -DictionaryValue* CreateDeletion( +base::DictionaryValue* CreateDeletion( const std::string& min_time, const std::string& max_time, const GURL& url) { - DictionaryValue* deletion = new DictionaryValue; + base::DictionaryValue* deletion = new base::DictionaryValue; deletion->SetString("type", "CHROME_HISTORY"); if (url.is_valid()) deletion->SetString("url", url.spec()); @@ -316,8 +316,8 @@ scoped_ptr<WebHistoryService::Request> WebHistoryService::QueryHistory( scoped_ptr<WebHistoryService::Request> WebHistoryService::ExpireHistory( const std::vector<ExpireHistoryArgs>& expire_list, const ExpireWebHistoryCallback& callback) { - DictionaryValue delete_request; - scoped_ptr<ListValue> deletions(new ListValue); + base::DictionaryValue delete_request; + scoped_ptr<base::ListValue> deletions(new base::ListValue); base::Time now = base::Time::Now(); for (std::vector<ExpireHistoryArgs>::const_iterator it = expire_list.begin(); @@ -380,7 +380,7 @@ void WebHistoryService::QueryHistoryCompletionCallback( const WebHistoryService::QueryWebHistoryCallback& callback, WebHistoryService::Request* request, bool success) { - scoped_ptr<DictionaryValue> response_value; + scoped_ptr<base::DictionaryValue> response_value; if (success) response_value = ReadResponse(static_cast<RequestImpl*>(request)); callback.Run(request, response_value.get()); @@ -390,7 +390,7 @@ void WebHistoryService::ExpireHistoryCompletionCallback( const WebHistoryService::ExpireWebHistoryCallback& callback, WebHistoryService::Request* request, bool success) { - scoped_ptr<DictionaryValue> response_value; + scoped_ptr<base::DictionaryValue> response_value; if (success) { response_value = ReadResponse(static_cast<RequestImpl*>(request)); if (response_value) diff --git a/chrome/browser/importer/external_process_importer_client.cc b/chrome/browser/importer/external_process_importer_client.cc index 64d7c47..d9e781a 100644 --- a/chrome/browser/importer/external_process_importer_client.cc +++ b/chrome/browser/importer/external_process_importer_client.cc @@ -297,7 +297,7 @@ void ExternalProcessImporterClient::StartProcessOnIOThread( // Dictionary of all localized strings that could be needed by the importer // in the external process. - DictionaryValue localized_strings; + base::DictionaryValue localized_strings; localized_strings.SetString( base::IntToString(IDS_BOOKMARK_GROUP), l10n_util::GetStringUTF8(IDS_BOOKMARK_GROUP)); diff --git a/chrome/browser/infobars/infobar_extension_api.cc b/chrome/browser/infobars/infobar_extension_api.cc index 8f48bf7..62dfd81 100644 --- a/chrome/browser/infobars/infobar_extension_api.cc +++ b/chrome/browser/infobars/infobar_extension_api.cc @@ -21,7 +21,7 @@ bool InfobarsShowFunction::RunImpl() { - DictionaryValue* args; + base::DictionaryValue* args; EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(0, &args)); const char kTabId[] = "tabId"; diff --git a/chrome/browser/invalidation/invalidator_storage.cc b/chrome/browser/invalidation/invalidator_storage.cc index 1d2fc86..39e32b6 100644 --- a/chrome/browser/invalidation/invalidator_storage.cc +++ b/chrome/browser/invalidation/invalidator_storage.cc @@ -24,7 +24,7 @@ const char kInvalidatorMaxInvalidationVersions[] = bool ValueToUnackedInvalidationStorageMap( - const ListValue& value, + const base::ListValue& value, syncer::UnackedInvalidationsMap* map) { for (size_t i = 0; i != value.GetSize(); ++i) { invalidation::ObjectId invalid_id; diff --git a/chrome/browser/local_discovery/privet_http.h b/chrome/browser/local_discovery/privet_http.h index 62bd585..730c2de 100644 --- a/chrome/browser/local_discovery/privet_http.h +++ b/chrome/browser/local_discovery/privet_http.h @@ -88,7 +88,7 @@ class PrivetRegisterOperation { const std::string& action, FailureReason reason, int printer_http_code, - const DictionaryValue* json) = 0; + const base::DictionaryValue* json) = 0; // Called when the registration is done. virtual void OnPrivetRegisterDone(PrivetRegisterOperation* operation, diff --git a/chrome/browser/local_discovery/privet_http_unittest.cc b/chrome/browser/local_discovery/privet_http_unittest.cc index 67d8044..c3228d5 100644 --- a/chrome/browser/local_discovery/privet_http_unittest.cc +++ b/chrome/browser/local_discovery/privet_http_unittest.cc @@ -354,7 +354,7 @@ class MockRegisterDelegate : public PrivetRegisterOperation::Delegate { const std::string& action, PrivetRegisterOperation::FailureReason reason, int printer_http_code, - const DictionaryValue* json) OVERRIDE { + const base::DictionaryValue* json) OVERRIDE { // TODO(noamsml): Save and test for JSON? OnPrivetRegisterErrorInternal(action, reason, printer_http_code); } diff --git a/chrome/browser/local_discovery/privet_url_fetcher_unittest.cc b/chrome/browser/local_discovery/privet_url_fetcher_unittest.cc index e0d3c68..a2a6383 100644 --- a/chrome/browser/local_discovery/privet_url_fetcher_unittest.cc +++ b/chrome/browser/local_discovery/privet_url_fetcher_unittest.cc @@ -46,10 +46,10 @@ class MockPrivetURLFetcherDelegate : public PrivetURLFetcher::Delegate { const PrivetURLFetcher::TokenCallback& callback) { } - const DictionaryValue* saved_value() { return saved_value_.get(); } + const base::DictionaryValue* saved_value() { return saved_value_.get(); } private: - scoped_ptr<DictionaryValue> saved_value_; + scoped_ptr<base::DictionaryValue> saved_value_; }; class PrivetURLFetcherTest : public ::testing::Test { diff --git a/chrome/browser/managed_mode/managed_mode_browsertest.cc b/chrome/browser/managed_mode/managed_mode_browsertest.cc index 631acce..a7f02e3 100644 --- a/chrome/browser/managed_mode/managed_mode_browsertest.cc +++ b/chrome/browser/managed_mode/managed_mode_browsertest.cc @@ -182,13 +182,14 @@ IN_PROC_BROWSER_TEST_F(ManagedModeBlockModeTest, GURL allowed_url("http://www.example.com/files/simple.html"); // Set the host as allowed. - scoped_ptr<DictionaryValue> dict(new DictionaryValue); + scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue); dict->SetBooleanWithoutPathExpansion(allowed_url.host(), true); ManagedUserSettingsService* managed_user_settings_service = ManagedUserSettingsServiceFactory::GetForProfile( browser()->profile()); managed_user_settings_service->SetLocalSettingForTesting( - managed_users::kContentPackManualBehaviorHosts, dict.PassAs<Value>()); + managed_users::kContentPackManualBehaviorHosts, + dict.PassAs<base::Value>()); EXPECT_EQ( ManagedUserService::MANUAL_ALLOW, managed_user_service_->GetManualBehaviorForHost(allowed_url.host())); @@ -246,13 +247,14 @@ IN_PROC_BROWSER_TEST_F(ManagedModeBlockModeTest, Unblock) { content::NotificationService::AllSources()); // Set the host as allowed. - scoped_ptr<DictionaryValue> dict(new DictionaryValue); + scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue); dict->SetBooleanWithoutPathExpansion(test_url.host(), true); ManagedUserSettingsService* managed_user_settings_service = ManagedUserSettingsServiceFactory::GetForProfile( browser()->profile()); managed_user_settings_service->SetLocalSettingForTesting( - managed_users::kContentPackManualBehaviorHosts, dict.PassAs<Value>()); + managed_users::kContentPackManualBehaviorHosts, + dict.PassAs<base::Value>()); EXPECT_EQ( ManagedUserService::MANUAL_ALLOW, managed_user_service_->GetManualBehaviorForHost(test_url.host())); diff --git a/chrome/browser/managed_mode/managed_mode_interstitial.cc b/chrome/browser/managed_mode/managed_mode_interstitial.cc index 8b1ac32..cfa05e2 100644 --- a/chrome/browser/managed_mode/managed_mode_interstitial.cc +++ b/chrome/browser/managed_mode/managed_mode_interstitial.cc @@ -100,7 +100,7 @@ ManagedModeInterstitial::ManagedModeInterstitial( ManagedModeInterstitial::~ManagedModeInterstitial() {} std::string ManagedModeInterstitial::GetHTMLContents() { - DictionaryValue strings; + base::DictionaryValue strings; strings.SetString("blockPageTitle", l10n_util::GetStringUTF16(IDS_BLOCK_INTERSTITIAL_TITLE)); diff --git a/chrome/browser/managed_mode/managed_mode_site_list.cc b/chrome/browser/managed_mode/managed_mode_site_list.cc index 4d60b26..115a10b 100644 --- a/chrome/browser/managed_mode/managed_mode_site_list.cc +++ b/chrome/browser/managed_mode/managed_mode_site_list.cc @@ -68,7 +68,7 @@ int GetCategoryId(const std::string& category) { // Takes a DictionaryValue entry from the JSON file and fills the whitelist // (via URL patterns or hostname hashes) and the URL in the corresponding Site // struct. -void AddWhitelistEntries(const DictionaryValue* site_dict, +void AddWhitelistEntries(const base::DictionaryValue* site_dict, ManagedModeSiteList::Site* site) { std::vector<std::string>* patterns = &site->patterns; @@ -173,7 +173,7 @@ void ManagedModeSiteList::GetSites(std::vector<Site>* sites) { // TODO(bauerb): We need to distinguish between "no category assigned" and // "not on any site list". int category_id = 0; - const ListValue* categories = NULL; + const base::ListValue* categories = NULL; if (entry->GetList(kCategoriesKey, &categories)) { for (base::ListValue::const_iterator it = categories->begin(); it != categories->end(); ++it) { @@ -204,7 +204,7 @@ bool ManagedModeSiteList::LazyLoad() { return false; } - DictionaryValue* dict = NULL; + base::DictionaryValue* dict = NULL; if (!value->GetAsDictionary(&dict)) { LOG(ERROR) << "Site list " << path_.value() << " is invalid"; return false; @@ -221,19 +221,19 @@ bool ManagedModeSiteList::LazyLoad() { return false; } - ListValue* sites = NULL; + base::ListValue* sites = NULL; if (dict->GetList(kSitesKey, &sites)) sites_.reset(sites->DeepCopy()); - DictionaryValue* categories = NULL; + base::DictionaryValue* categories = NULL; if (dict->GetDictionary(kCategoriesKey, &categories)) categories_.reset(categories->DeepCopy()); return true; } -void ManagedModeSiteList::CopyThumbnailUrl(const DictionaryValue* source, - DictionaryValue* dest) { +void ManagedModeSiteList::CopyThumbnailUrl(const base::DictionaryValue* source, + base::DictionaryValue* dest) { if (!source->HasKey(kThumbnailKey)) return; diff --git a/chrome/browser/managed_mode/managed_user_refresh_token_fetcher.cc b/chrome/browser/managed_mode/managed_user_refresh_token_fetcher.cc index aade313..c8c8534 100644 --- a/chrome/browser/managed_mode/managed_user_refresh_token_fetcher.cc +++ b/chrome/browser/managed_mode/managed_user_refresh_token_fetcher.cc @@ -204,7 +204,7 @@ void ManagedUserRefreshTokenFetcherImpl::OnURLFetchComplete( std::string response_body; source->GetResponseAsString(&response_body); scoped_ptr<base::Value> value(base::JSONReader::Read(response_body)); - DictionaryValue* dict = NULL; + base::DictionaryValue* dict = NULL; if (!value.get() || !value->GetAsDictionary(&dict)) { DispatchNetworkError(net::ERR_INVALID_RESPONSE); return; diff --git a/chrome/browser/managed_mode/managed_user_registration_utility.cc b/chrome/browser/managed_mode/managed_user_registration_utility.cc index 9b6d630..65eb659 100644 --- a/chrome/browser/managed_mode/managed_user_registration_utility.cc +++ b/chrome/browser/managed_mode/managed_user_registration_utility.cc @@ -201,7 +201,8 @@ void ManagedUserRegistrationUtilityImpl::Register( callback_ = callback; pending_managed_user_id_ = managed_user_id; - const DictionaryValue* dict = prefs_->GetDictionary(prefs::kManagedUsers); + const base::DictionaryValue* dict = + prefs_->GetDictionary(prefs::kManagedUsers); is_existing_managed_user_ = dict->HasKey(managed_user_id); if (!is_existing_managed_user_) { managed_user_sync_service_->AddManagedUser(pending_managed_user_id_, diff --git a/chrome/browser/managed_mode/managed_user_service.cc b/chrome/browser/managed_mode/managed_user_service.cc index cf8979a..b7c60ac 100644 --- a/chrome/browser/managed_mode/managed_user_service.cc +++ b/chrome/browser/managed_mode/managed_user_service.cc @@ -455,19 +455,19 @@ void ManagedUserService::AddAccessRequest(const GURL& url) { std::string key = ManagedUserSettingsService::MakeSplitSettingKey( kManagedUserAccessRequestKeyPrefix, output); - scoped_ptr<DictionaryValue> dict(new DictionaryValue); + scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue); // TODO(sergiu): Use sane time here when it's ready. dict->SetDouble(kManagedUserAccessRequestTime, base::Time::Now().ToJsTime()); dict->SetString(kManagedUserName, profile_->GetProfileName()); - GetSettingsService()->UploadItem(key, dict.PassAs<Value>()); + GetSettingsService()->UploadItem(key, dict.PassAs<base::Value>()); } ManagedUserService::ManualBehavior ManagedUserService::GetManualBehaviorForHost( const std::string& hostname) { - const DictionaryValue* dict = + const base::DictionaryValue* dict = profile_->GetPrefs()->GetDictionary(prefs::kManagedModeManualHosts); bool allow = false; if (!dict->GetBooleanWithoutPathExpansion(hostname, &allow)) @@ -478,7 +478,7 @@ ManagedUserService::ManualBehavior ManagedUserService::GetManualBehaviorForHost( ManagedUserService::ManualBehavior ManagedUserService::GetManualBehaviorForURL( const GURL& url) { - const DictionaryValue* dict = + const base::DictionaryValue* dict = profile_->GetPrefs()->GetDictionary(prefs::kManagedModeManualURLs); GURL normalized_url = ManagedModeURLFilter::Normalize(url); bool allow = false; @@ -490,9 +490,9 @@ ManagedUserService::ManualBehavior ManagedUserService::GetManualBehaviorForURL( void ManagedUserService::GetManualExceptionsForHost(const std::string& host, std::vector<GURL>* urls) { - const DictionaryValue* dict = + const base::DictionaryValue* dict = profile_->GetPrefs()->GetDictionary(prefs::kManagedModeManualURLs); - for (DictionaryValue::Iterator it(*dict); !it.IsAtEnd(); it.Advance()) { + for (base::DictionaryValue::Iterator it(*dict); !it.IsAtEnd(); it.Advance()) { GURL url(it.key()); if (url.host() == host) urls->push_back(url); @@ -633,11 +633,11 @@ void ManagedUserService::OnManagedUserRegistered( } void ManagedUserService::UpdateManualHosts() { - const DictionaryValue* dict = + const base::DictionaryValue* dict = profile_->GetPrefs()->GetDictionary(prefs::kManagedModeManualHosts); scoped_ptr<std::map<std::string, bool> > host_map( new std::map<std::string, bool>()); - for (DictionaryValue::Iterator it(*dict); !it.IsAtEnd(); it.Advance()) { + for (base::DictionaryValue::Iterator it(*dict); !it.IsAtEnd(); it.Advance()) { bool allow = false; bool result = it.value().GetAsBoolean(&allow); DCHECK(result); @@ -647,10 +647,10 @@ void ManagedUserService::UpdateManualHosts() { } void ManagedUserService::UpdateManualURLs() { - const DictionaryValue* dict = + const base::DictionaryValue* dict = profile_->GetPrefs()->GetDictionary(prefs::kManagedModeManualURLs); scoped_ptr<std::map<GURL, bool> > url_map(new std::map<GURL, bool>()); - for (DictionaryValue::Iterator it(*dict); !it.IsAtEnd(); it.Advance()) { + for (base::DictionaryValue::Iterator it(*dict); !it.IsAtEnd(); it.Advance()) { bool allow = false; bool result = it.value().GetAsBoolean(&allow); DCHECK(result); @@ -675,10 +675,10 @@ void ManagedUserService::RecordProfileAndBrowserEventsHelper( key_prefix, base::Int64ToString(base::TimeTicks::Now().ToInternalValue())); - scoped_ptr<DictionaryValue> dict(new DictionaryValue); + scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue); // TODO(bauerb): Use sane time when ready. dict->SetDouble(kEventTimestamp, base::Time::Now().ToJsTime()); - GetSettingsService()->UploadItem(key, dict.PassAs<Value>()); + GetSettingsService()->UploadItem(key, dict.PassAs<base::Value>()); } diff --git a/chrome/browser/managed_mode/managed_user_service_unittest.cc b/chrome/browser/managed_mode/managed_user_service_unittest.cc index c2d27ae..3466fd6 100644 --- a/chrome/browser/managed_mode/managed_user_service_unittest.cc +++ b/chrome/browser/managed_mode/managed_user_service_unittest.cc @@ -187,9 +187,9 @@ class ManagedUserServiceExtensionTestBase : public ExtensionServiceTestBase { } scoped_refptr<extensions::Extension> MakeThemeExtension() { - scoped_ptr<DictionaryValue> source(new DictionaryValue()); + scoped_ptr<base::DictionaryValue> source(new base::DictionaryValue()); source->SetString(extensions::manifest_keys::kName, "Theme"); - source->Set(extensions::manifest_keys::kTheme, new DictionaryValue()); + source->Set(extensions::manifest_keys::kTheme, new base::DictionaryValue()); source->SetString(extensions::manifest_keys::kVersion, "1.0"); extensions::ExtensionBuilder builder; scoped_refptr<extensions::Extension> extension = @@ -198,7 +198,7 @@ class ManagedUserServiceExtensionTestBase : public ExtensionServiceTestBase { } scoped_refptr<extensions::Extension> MakeExtension() { - scoped_ptr<DictionaryValue> manifest = extensions::DictionaryBuilder() + scoped_ptr<base::DictionaryValue> manifest = extensions::DictionaryBuilder() .Set(extensions::manifest_keys::kName, "Extension") .Set(extensions::manifest_keys::kVersion, "1.0") .Build(); diff --git a/chrome/browser/managed_mode/managed_user_settings_service.cc b/chrome/browser/managed_mode/managed_user_settings_service.cc index b996cce..9f229b6 100644 --- a/chrome/browser/managed_mode/managed_user_settings_service.cc +++ b/chrome/browser/managed_mode/managed_user_settings_service.cc @@ -49,7 +49,7 @@ bool SettingShouldApplyToPrefs(const std::string& name) { } // namespace ManagedUserSettingsService::ManagedUserSettingsService() - : active_(false), local_settings_(new DictionaryValue) {} + : active_(false), local_settings_(new base::DictionaryValue) {} ManagedUserSettingsService::~ManagedUserSettingsService() {} @@ -105,11 +105,11 @@ std::string ManagedUserSettingsService::MakeSplitSettingKey( } void ManagedUserSettingsService::UploadItem(const std::string& key, - scoped_ptr<Value> value) { + scoped_ptr<base::Value> value) { DCHECK(!SettingShouldApplyToPrefs(key)); std::string key_suffix = key; - DictionaryValue* dict = NULL; + base::DictionaryValue* dict = NULL; if (sync_processor_) { content::RecordAction(UserMetricsAction("ManagedUsers_UploadItem_Syncing")); dict = GetDictionaryAndSplitKey(&key_suffix); @@ -134,7 +134,7 @@ void ManagedUserSettingsService::UploadItem(const std::string& key, void ManagedUserSettingsService::SetLocalSettingForTesting( const std::string& key, - scoped_ptr<Value> value) { + scoped_ptr<base::Value> value) { if (value) local_settings_->SetWithoutPathExpansion(key, value.release()); else @@ -146,7 +146,7 @@ void ManagedUserSettingsService::SetLocalSettingForTesting( // static SyncData ManagedUserSettingsService::CreateSyncDataForSetting( const std::string& name, - const Value& value) { + const base::Value& value) { std::string json_value; base::JSONWriter::Write(&value, &json_value); ::sync_pb::EntitySpecifics specifics; @@ -175,9 +175,10 @@ SyncMergeResult ManagedUserSettingsService::MergeDataAndStartSyncing( DCHECK_EQ(MANAGED_USER_SETTINGS, it->GetDataType()); const ::sync_pb::ManagedUserSettingSpecifics& managed_user_setting = it->GetSpecifics().managed_user_setting(); - scoped_ptr<Value> value(JSONReader::Read(managed_user_setting.value())); + scoped_ptr<base::Value> value( + JSONReader::Read(managed_user_setting.value())); std::string name_suffix = managed_user_setting.name(); - DictionaryValue* dict = GetDictionaryAndSplitKey(&name_suffix); + base::DictionaryValue* dict = GetDictionaryAndSplitKey(&name_suffix); dict->SetWithoutPathExpansion(name_suffix, value.release()); } store_->ReportValueChanged(kAtomicSettings); @@ -187,11 +188,11 @@ SyncMergeResult ManagedUserSettingsService::MergeDataAndStartSyncing( // Upload all the queued up items (either with an ADD or an UPDATE action, // depending on whether they already exist) and move them to split settings. SyncChangeList change_list; - DictionaryValue* queued_items = GetQueuedItems(); - for (DictionaryValue::Iterator it(*queued_items); !it.IsAtEnd(); + base::DictionaryValue* queued_items = GetQueuedItems(); + for (base::DictionaryValue::Iterator it(*queued_items); !it.IsAtEnd(); it.Advance()) { std::string key_suffix = it.key(); - DictionaryValue* dict = GetDictionaryAndSplitKey(&key_suffix); + base::DictionaryValue* dict = GetDictionaryAndSplitKey(&key_suffix); SyncData data = CreateSyncDataForSetting(it.key(), it.value()); SyncChange::SyncChangeType change_type = dict->HasKey(key_suffix) ? SyncChange::ACTION_UPDATE @@ -223,15 +224,16 @@ SyncDataList ManagedUserSettingsService::GetAllSyncData( ModelType type) const { DCHECK_EQ(syncer::MANAGED_USER_SETTINGS, type); SyncDataList data; - for (DictionaryValue::Iterator it(*GetAtomicSettings()); !it.IsAtEnd(); + for (base::DictionaryValue::Iterator it(*GetAtomicSettings()); !it.IsAtEnd(); it.Advance()) { data.push_back(CreateSyncDataForSetting(it.key(), it.value())); } - for (DictionaryValue::Iterator it(*GetSplitSettings()); !it.IsAtEnd(); + for (base::DictionaryValue::Iterator it(*GetSplitSettings()); !it.IsAtEnd(); it.Advance()) { - const DictionaryValue* dict = NULL; + const base::DictionaryValue* dict = NULL; it.value().GetAsDictionary(&dict); - for (DictionaryValue::Iterator jt(*dict); !jt.IsAtEnd(); jt.Advance()) { + for (base::DictionaryValue::Iterator jt(*dict); + !jt.IsAtEnd(); jt.Advance()) { data.push_back(CreateSyncDataForSetting( MakeSplitSettingKey(it.key(), jt.key()), jt.value())); } @@ -250,11 +252,12 @@ SyncError ManagedUserSettingsService::ProcessSyncChanges( const ::sync_pb::ManagedUserSettingSpecifics& managed_user_setting = data.GetSpecifics().managed_user_setting(); std::string key = managed_user_setting.name(); - DictionaryValue* dict = GetDictionaryAndSplitKey(&key); + base::DictionaryValue* dict = GetDictionaryAndSplitKey(&key); switch (it->change_type()) { case SyncChange::ACTION_ADD: case SyncChange::ACTION_UPDATE: { - scoped_ptr<Value> value(JSONReader::Read(managed_user_setting.value())); + scoped_ptr<base::Value> value( + JSONReader::Read(managed_user_setting.value())); if (dict->HasKey(key)) { DLOG_IF(WARNING, it->change_type() == SyncChange::ACTION_ADD) << "Value for key " << key << " already exists"; @@ -293,10 +296,10 @@ void ManagedUserSettingsService::OnInitializationCompleted(bool success) { InformSubscribers(); } -DictionaryValue* ManagedUserSettingsService::GetOrCreateDictionary( +base::DictionaryValue* ManagedUserSettingsService::GetOrCreateDictionary( const std::string& key) const { - Value* value = NULL; - DictionaryValue* dict = NULL; + base::Value* value = NULL; + base::DictionaryValue* dict = NULL; if (store_->GetMutableValue(key, &value)) { bool success = value->GetAsDictionary(&dict); DCHECK(success); @@ -308,29 +311,29 @@ DictionaryValue* ManagedUserSettingsService::GetOrCreateDictionary( return dict; } -DictionaryValue* ManagedUserSettingsService::GetAtomicSettings() const { +base::DictionaryValue* ManagedUserSettingsService::GetAtomicSettings() const { return GetOrCreateDictionary(kAtomicSettings); } -DictionaryValue* ManagedUserSettingsService::GetSplitSettings() const { +base::DictionaryValue* ManagedUserSettingsService::GetSplitSettings() const { return GetOrCreateDictionary(kSplitSettings); } -DictionaryValue* ManagedUserSettingsService::GetQueuedItems() const { +base::DictionaryValue* ManagedUserSettingsService::GetQueuedItems() const { return GetOrCreateDictionary(kQueuedItems); } -DictionaryValue* ManagedUserSettingsService::GetDictionaryAndSplitKey( +base::DictionaryValue* ManagedUserSettingsService::GetDictionaryAndSplitKey( std::string* key) const { size_t pos = key->find_first_of(kSplitSettingKeySeparator); if (pos == std::string::npos) return GetAtomicSettings(); - DictionaryValue* split_settings = GetSplitSettings(); + base::DictionaryValue* split_settings = GetSplitSettings(); std::string prefix = key->substr(0, pos); - DictionaryValue* dict = NULL; + base::DictionaryValue* dict = NULL; if (!split_settings->GetDictionary(prefix, &dict)) { - dict = new DictionaryValue; + dict = new base::DictionaryValue; DCHECK(!split_settings->HasKey(prefix)); split_settings->Set(prefix, dict); } @@ -338,15 +341,15 @@ DictionaryValue* ManagedUserSettingsService::GetDictionaryAndSplitKey( return dict; } -scoped_ptr<DictionaryValue> ManagedUserSettingsService::GetSettings() { +scoped_ptr<base::DictionaryValue> ManagedUserSettingsService::GetSettings() { DCHECK(IsReady()); if (!active_) return scoped_ptr<base::DictionaryValue>(); - scoped_ptr<DictionaryValue> settings(local_settings_->DeepCopy()); + scoped_ptr<base::DictionaryValue> settings(local_settings_->DeepCopy()); - DictionaryValue* atomic_settings = GetAtomicSettings(); - for (DictionaryValue::Iterator it(*atomic_settings); !it.IsAtEnd(); + base::DictionaryValue* atomic_settings = GetAtomicSettings(); + for (base::DictionaryValue::Iterator it(*atomic_settings); !it.IsAtEnd(); it.Advance()) { if (!SettingShouldApplyToPrefs(it.key())) continue; @@ -354,8 +357,8 @@ scoped_ptr<DictionaryValue> ManagedUserSettingsService::GetSettings() { settings->Set(it.key(), it.value().DeepCopy()); } - DictionaryValue* split_settings = GetSplitSettings(); - for (DictionaryValue::Iterator it(*split_settings); !it.IsAtEnd(); + base::DictionaryValue* split_settings = GetSplitSettings(); + for (base::DictionaryValue::Iterator it(*split_settings); !it.IsAtEnd(); it.Advance()) { if (!SettingShouldApplyToPrefs(it.key())) continue; diff --git a/chrome/browser/managed_mode/managed_user_settings_service_unittest.cc b/chrome/browser/managed_mode/managed_user_settings_service_unittest.cc index e48d584..805690b 100644 --- a/chrome/browser/managed_mode/managed_user_settings_service_unittest.cc +++ b/chrome/browser/managed_mode/managed_user_settings_service_unittest.cc @@ -135,7 +135,7 @@ class ManagedUserSettingsServiceTest : public ::testing::Test { EXPECT_TRUE(split_items_.GetWithoutPathExpansion(key, &expected_value)); } - scoped_ptr<Value> value( + scoped_ptr<base::Value> value( base::JSONReader::Read(managed_user_setting.value())); EXPECT_TRUE(expected_value->Equals(value.get())); } diff --git a/chrome/browser/managed_mode/managed_user_sync_service.cc b/chrome/browser/managed_mode/managed_user_sync_service.cc index cdb652d..c9fcbb0 100644 --- a/chrome/browser/managed_mode/managed_user_sync_service.cc +++ b/chrome/browser/managed_mode/managed_user_sync_service.cc @@ -62,8 +62,8 @@ SyncData CreateLocalSyncData(const std::string& id, } SyncData CreateSyncDataFromDictionaryEntry( - const DictionaryValue::Iterator& it) { - const DictionaryValue* dict = NULL; + const base::DictionaryValue::Iterator& it) { + const base::DictionaryValue* dict = NULL; bool success = it.value().GetAsDictionary(&dict); DCHECK(success); bool acknowledged = false; @@ -157,8 +157,8 @@ void ManagedUserSyncService::AddManagedUser(const std::string& id, const std::string& master_key, int avatar_index) { DictionaryPrefUpdate update(prefs_, prefs::kManagedUsers); - DictionaryValue* dict = update.Get(); - DictionaryValue* value = new DictionaryValue; + base::DictionaryValue* dict = update.Get(); + base::DictionaryValue* value = new base::DictionaryValue; value->SetString(kName, name); value->SetString(kMasterKey, master_key); std::string chrome_avatar; @@ -206,7 +206,7 @@ void ManagedUserSyncService::DeleteManagedUser(const std::string& id) { DCHECK(!sync_error.IsSet()); } -const DictionaryValue* ManagedUserSyncService::GetManagedUsers() { +const base::DictionaryValue* ManagedUserSyncService::GetManagedUsers() { DCHECK(sync_processor_); return prefs_->GetDictionary(prefs::kManagedUsers); } @@ -215,9 +215,9 @@ bool ManagedUserSyncService::UpdateManagedUserAvatarIfNeeded( const std::string& id, int avatar_index) { DictionaryPrefUpdate update(prefs_, prefs::kManagedUsers); - DictionaryValue* dict = update.Get(); + base::DictionaryValue* dict = update.Get(); DCHECK(dict->HasKey(id)); - DictionaryValue* value = NULL; + base::DictionaryValue* value = NULL; bool success = dict->GetDictionaryWithoutPathExpansion(id, &value); DCHECK(success); @@ -300,7 +300,7 @@ SyncMergeResult ManagedUserSyncService::MergeDataAndStartSyncing( SyncMergeResult result(MANAGED_USERS); DictionaryPrefUpdate update(prefs_, prefs::kManagedUsers); - DictionaryValue* dict = update.Get(); + base::DictionaryValue* dict = update.Get(); result.set_num_items_before_association(dict->size()); std::set<std::string> seen_ids; int num_items_added = 0; @@ -310,7 +310,7 @@ SyncMergeResult ManagedUserSyncService::MergeDataAndStartSyncing( DCHECK_EQ(MANAGED_USERS, it->GetDataType()); const ManagedUserSpecifics& managed_user = it->GetSpecifics().managed_user(); - DictionaryValue* value = new DictionaryValue(); + base::DictionaryValue* value = new base::DictionaryValue(); value->SetString(kName, managed_user.name()); value->SetBoolean(kAcknowledged, managed_user.acknowledged()); value->SetString(kMasterKey, managed_user.master_key()); @@ -324,7 +324,7 @@ SyncMergeResult ManagedUserSyncService::MergeDataAndStartSyncing( seen_ids.insert(managed_user.id()); } - for (DictionaryValue::Iterator it(*dict); !it.IsAtEnd(); it.Advance()) { + for (base::DictionaryValue::Iterator it(*dict); !it.IsAtEnd(); it.Advance()) { if (seen_ids.find(it.key()) != seen_ids.end()) continue; @@ -355,8 +355,8 @@ SyncDataList ManagedUserSyncService::GetAllSyncData( ModelType type) const { SyncDataList data; DictionaryPrefUpdate update(prefs_, prefs::kManagedUsers); - DictionaryValue* dict = update.Get(); - for (DictionaryValue::Iterator it(*dict); !it.IsAtEnd(); it.Advance()) + base::DictionaryValue* dict = update.Get(); + for (base::DictionaryValue::Iterator it(*dict); !it.IsAtEnd(); it.Advance()) data.push_back(CreateSyncDataFromDictionaryEntry(it)); return data; @@ -367,7 +367,7 @@ SyncError ManagedUserSyncService::ProcessSyncChanges( const SyncChangeList& change_list) { SyncError error; DictionaryPrefUpdate update(prefs_, prefs::kManagedUsers); - DictionaryValue* dict = update.Get(); + base::DictionaryValue* dict = update.Get(); for (SyncChangeList::const_iterator it = change_list.begin(); it != change_list.end(); ++it) { SyncData data = it->sync_data(); @@ -379,7 +379,7 @@ SyncError ManagedUserSyncService::ProcessSyncChanges( case SyncChange::ACTION_UPDATE: { // Every item we get from the server should be acknowledged. DCHECK(managed_user.acknowledged()); - const DictionaryValue* old_value = NULL; + const base::DictionaryValue* old_value = NULL; dict->GetDictionaryWithoutPathExpansion(managed_user.id(), &old_value); // For an update action, the managed user should already exist, for an @@ -393,7 +393,7 @@ SyncError ManagedUserSyncService::ProcessSyncChanges( if (old_value && !old_value->HasKey(kAcknowledged)) NotifyManagedUserAcknowledged(managed_user.id()); - DictionaryValue* value = new DictionaryValue; + base::DictionaryValue* value = new base::DictionaryValue; value->SetString(kName, managed_user.name()); value->SetBoolean(kAcknowledged, managed_user.acknowledged()); value->SetString(kMasterKey, managed_user.master_key()); @@ -436,7 +436,7 @@ void ManagedUserSyncService::NotifyManagedUsersSyncingStopped() { } void ManagedUserSyncService::DispatchCallbacks() { - const DictionaryValue* managed_users = + const base::DictionaryValue* managed_users = prefs_->GetDictionary(prefs::kManagedUsers); for (std::vector<ManagedUsersCallback>::iterator it = callbacks_.begin(); it != callbacks_.end(); ++it) { diff --git a/chrome/browser/managed_mode/managed_user_sync_service_unittest.cc b/chrome/browser/managed_mode/managed_user_sync_service_unittest.cc index dce07de..ead1441 100644 --- a/chrome/browser/managed_mode/managed_user_sync_service_unittest.cc +++ b/chrome/browser/managed_mode/managed_user_sync_service_unittest.cc @@ -181,11 +181,11 @@ TEST_F(ManagedUserSyncServiceTest, MergeExisting) { const char kAvatar4[] = ""; { DictionaryPrefUpdate update(prefs(), prefs::kManagedUsers); - DictionaryValue* managed_users = update.Get(); - DictionaryValue* dict = new DictionaryValue; + base::DictionaryValue* managed_users = update.Get(); + base::DictionaryValue* dict = new base::DictionaryValue; dict->SetString(kNameKey, kName1); managed_users->Set(kUserId1, dict); - dict = new DictionaryValue; + dict = new base::DictionaryValue; dict->SetString(kNameKey, kName2); dict->SetBoolean(kAcknowledgedKey, true); managed_users->Set(kUserId2, dict); @@ -212,13 +212,13 @@ TEST_F(ManagedUserSyncServiceTest, MergeExisting) { EXPECT_EQ(2, result.num_items_before_association()); EXPECT_EQ(4, result.num_items_after_association()); - const DictionaryValue* managed_users = service()->GetManagedUsers(); + const base::DictionaryValue* managed_users = service()->GetManagedUsers(); EXPECT_EQ(4u, managed_users->size()); EXPECT_TRUE(async_managed_users); EXPECT_TRUE(managed_users->Equals(async_managed_users)); { - const DictionaryValue* managed_user = NULL; + const base::DictionaryValue* managed_user = NULL; ASSERT_TRUE(managed_users->GetDictionary(kUserId2, &managed_user)); ASSERT_TRUE(managed_user); std::string name; @@ -232,7 +232,7 @@ TEST_F(ManagedUserSyncServiceTest, MergeExisting) { EXPECT_EQ(kAvatar2, avatar); } { - const DictionaryValue* managed_user = NULL; + const base::DictionaryValue* managed_user = NULL; ASSERT_TRUE(managed_users->GetDictionary(kUserId3, &managed_user)); ASSERT_TRUE(managed_user); std::string name; @@ -246,7 +246,7 @@ TEST_F(ManagedUserSyncServiceTest, MergeExisting) { EXPECT_EQ(kAvatar3, avatar); } { - const DictionaryValue* managed_user = NULL; + const base::DictionaryValue* managed_user = NULL; ASSERT_TRUE(managed_users->GetDictionary(kUserId4, &managed_user)); ASSERT_TRUE(managed_user); std::string name; diff --git a/chrome/browser/managed_mode/supervised_user_pref_store_unittest.cc b/chrome/browser/managed_mode/supervised_user_pref_store_unittest.cc index 2e5a3b8..ae268dc 100644 --- a/chrome/browser/managed_mode/supervised_user_pref_store_unittest.cc +++ b/chrome/browser/managed_mode/supervised_user_pref_store_unittest.cc @@ -25,7 +25,7 @@ class SupervisedUserPrefStoreFixture : public PrefStore::Observer { ManagedUserSettingsService* settings_service); virtual ~SupervisedUserPrefStoreFixture(); - DictionaryValue* changed_prefs() { + base::DictionaryValue* changed_prefs() { return &changed_prefs_; } @@ -39,7 +39,7 @@ class SupervisedUserPrefStoreFixture : public PrefStore::Observer { private: scoped_refptr<SupervisedUserPrefStore> pref_store_; - DictionaryValue changed_prefs_; + base::DictionaryValue changed_prefs_; bool initialization_completed_; }; @@ -56,7 +56,7 @@ SupervisedUserPrefStoreFixture::~SupervisedUserPrefStoreFixture() { void SupervisedUserPrefStoreFixture::OnPrefValueChanged( const std::string& key) { - const Value* value = NULL; + const base::Value* value = NULL; ASSERT_TRUE(pref_store_->GetValue(key, &value)); changed_prefs_.Set(key, value->DeepCopy()); } @@ -108,7 +108,7 @@ TEST_F(SupervisedUserPrefStoreTest, ConfigureSettings) { EXPECT_FALSE(allow_deleting_browser_history); // kManagedModeManualHosts does not have a hardcoded value. - DictionaryValue* manual_hosts = NULL; + base::DictionaryValue* manual_hosts = NULL; EXPECT_FALSE(fixture.changed_prefs()->GetDictionary( prefs::kManagedModeManualHosts, &manual_hosts)); @@ -124,12 +124,12 @@ TEST_F(SupervisedUserPrefStoreTest, ConfigureSettings) { EXPECT_EQ(0u, fixture.changed_prefs()->size()); // kManagedModeManualHosts can be configured by the custodian. - scoped_ptr<DictionaryValue> dict(new DictionaryValue); + scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue); dict->SetBoolean("example.com", true); dict->SetBoolean("moose.org", false); service_.SetLocalSettingForTesting( managed_users::kContentPackManualBehaviorHosts, - scoped_ptr<Value>(dict->DeepCopy())); + scoped_ptr<base::Value>(dict->DeepCopy())); EXPECT_EQ(1u, fixture.changed_prefs()->size()); ASSERT_TRUE(fixture.changed_prefs()->GetDictionary( prefs::kManagedModeManualHosts, &manual_hosts)); @@ -140,7 +140,7 @@ TEST_F(SupervisedUserPrefStoreTest, ConfigureSettings) { fixture.changed_prefs()->Clear(); service_.SetLocalSettingForTesting( managed_users::kForceSafeSearch, - scoped_ptr<Value>(new base::FundamentalValue(false))); + scoped_ptr<base::Value>(new base::FundamentalValue(false))); EXPECT_EQ(1u, fixture.changed_prefs()->size()); EXPECT_TRUE(fixture.changed_prefs()->GetBoolean(prefs::kForceSafeSearch, &force_safesearch)); diff --git a/chrome/browser/media_galleries/media_galleries_preferences.cc b/chrome/browser/media_galleries/media_galleries_preferences.cc index 740216a..4b44d30 100644 --- a/chrome/browser/media_galleries/media_galleries_preferences.cc +++ b/chrome/browser/media_galleries/media_galleries_preferences.cc @@ -94,7 +94,7 @@ int NumberExtensionsUsingMediaGalleries(Profile* profile) { return count; } -bool GetPrefId(const DictionaryValue& dict, MediaGalleryPrefId* value) { +bool GetPrefId(const base::DictionaryValue& dict, MediaGalleryPrefId* value) { std::string string_id; if (!dict.GetString(kMediaGalleriesPrefIdKey, &string_id) || !base::StringToUint64(string_id, value)) { @@ -104,7 +104,8 @@ bool GetPrefId(const DictionaryValue& dict, MediaGalleryPrefId* value) { return true; } -bool GetType(const DictionaryValue& dict, MediaGalleryPrefInfo::Type* type) { +bool GetType(const base::DictionaryValue& dict, + MediaGalleryPrefInfo::Type* type) { std::string string_type; if (!dict.GetString(kMediaGalleriesTypeKey, &string_type)) return false; @@ -126,7 +127,7 @@ bool GetType(const DictionaryValue& dict, MediaGalleryPrefInfo::Type* type) { } bool PopulateGalleryPrefInfoFromDictionary( - const DictionaryValue& dict, MediaGalleryPrefInfo* out_gallery_info) { + const base::DictionaryValue& dict, MediaGalleryPrefInfo* out_gallery_info) { MediaGalleryPrefId pref_id; base::string16 display_name; std::string device_id; @@ -175,9 +176,9 @@ bool PopulateGalleryPrefInfoFromDictionary( return true; } -DictionaryValue* CreateGalleryPrefInfoDictionary( +base::DictionaryValue* CreateGalleryPrefInfoDictionary( const MediaGalleryPrefInfo& gallery) { - DictionaryValue* dict = new DictionaryValue(); + base::DictionaryValue* dict = new base::DictionaryValue(); dict->SetString(kMediaGalleriesPrefIdKey, base::Uint64ToString(gallery.pref_id)); if (!gallery.volume_metadata_valid) @@ -233,7 +234,7 @@ bool HasAutoDetectedGalleryPermission(const extensions::Extension& extension) { // Retrieves the MediaGalleryPermission from the given dictionary; DCHECKs on // failure. bool GetMediaGalleryPermissionFromDictionary( - const DictionaryValue* dict, + const base::DictionaryValue* dict, MediaGalleryPermission* out_permission) { std::string string_id; if (dict->GetString(kMediaGalleryIdKey, &string_id) && @@ -511,10 +512,11 @@ bool MediaGalleriesPreferences::UpdateDeviceIDForSingletonType( PrefService* prefs = profile_->GetPrefs(); scoped_ptr<ListPrefUpdate> update(new ListPrefUpdate( prefs, prefs::kMediaGalleriesRememberedGalleries)); - ListValue* list = update->Get(); - for (ListValue::iterator iter = list->begin(); iter != list->end(); ++iter) { + base::ListValue* list = update->Get(); + for (base::ListValue::iterator iter = list->begin(); + iter != list->end(); ++iter) { // All of these calls should succeed, but preferences file can be corrupt. - DictionaryValue* dict; + base::DictionaryValue* dict; if (!(*iter)->GetAsDictionary(&dict)) continue; std::string this_device_id; @@ -575,12 +577,12 @@ void MediaGalleriesPreferences::InitFromPrefs() { device_map_.clear(); PrefService* prefs = profile_->GetPrefs(); - const ListValue* list = prefs->GetList( + const base::ListValue* list = prefs->GetList( prefs::kMediaGalleriesRememberedGalleries); if (list) { - for (ListValue::const_iterator it = list->begin(); + for (base::ListValue::const_iterator it = list->begin(); it != list->end(); ++it) { - const DictionaryValue* dict = NULL; + const base::DictionaryValue* dict = NULL; if (!(*it)->GetAsDictionary(&dict)) continue; @@ -757,12 +759,12 @@ MediaGalleryPrefId MediaGalleriesPreferences::AddGalleryInternal( PrefService* prefs = profile_->GetPrefs(); scoped_ptr<ListPrefUpdate> update( new ListPrefUpdate(prefs, prefs::kMediaGalleriesRememberedGalleries)); - ListValue* list = update->Get(); + base::ListValue* list = update->Get(); - for (ListValue::const_iterator list_iter = list->begin(); + for (base::ListValue::const_iterator list_iter = list->begin(); list_iter != list->end(); ++list_iter) { - DictionaryValue* dict; + base::DictionaryValue* dict; MediaGalleryPrefId iter_id; if ((*list_iter)->GetAsDictionary(&dict) && GetPrefId(*dict, &iter_id) && @@ -822,7 +824,7 @@ MediaGalleryPrefId MediaGalleriesPreferences::AddGalleryInternal( { ListPrefUpdate update(prefs, prefs::kMediaGalleriesRememberedGalleries); - ListValue* list = update.Get(); + base::ListValue* list = update.Get(); list->Append(CreateGalleryPrefInfoDictionary(gallery_info)); } InitFromPrefs(); @@ -859,13 +861,14 @@ void MediaGalleriesPreferences::ForgetGalleryById(MediaGalleryPrefId pref_id) { PrefService* prefs = profile_->GetPrefs(); scoped_ptr<ListPrefUpdate> update(new ListPrefUpdate( prefs, prefs::kMediaGalleriesRememberedGalleries)); - ListValue* list = update->Get(); + base::ListValue* list = update->Get(); if (!ContainsKey(known_galleries_, pref_id)) return; - for (ListValue::iterator iter = list->begin(); iter != list->end(); ++iter) { - DictionaryValue* dict; + for (base::ListValue::iterator iter = list->begin(); + iter != list->end(); ++iter) { + base::DictionaryValue* dict; MediaGalleryPrefId iter_id; if ((*iter)->GetAsDictionary(&dict) && GetPrefId(*dict, &iter_id) && pref_id == iter_id) { @@ -994,14 +997,14 @@ bool MediaGalleriesPreferences::SetGalleryPermissionInPrefs( ExtensionPrefs::ScopedListUpdate update(GetExtensionPrefs(), extension_id, kMediaGalleriesPermissions); - ListValue* permissions = update.Get(); + base::ListValue* permissions = update.Get(); if (!permissions) { permissions = update.Create(); } else { // If the gallery is already in the list, update the permission... - for (ListValue::iterator iter = permissions->begin(); + for (base::ListValue::iterator iter = permissions->begin(); iter != permissions->end(); ++iter) { - DictionaryValue* dict = NULL; + base::DictionaryValue* dict = NULL; if (!(*iter)->GetAsDictionary(&dict)) continue; MediaGalleryPermission perm; @@ -1018,7 +1021,7 @@ bool MediaGalleriesPreferences::SetGalleryPermissionInPrefs( } } // ...Otherwise, add a new entry for the gallery. - DictionaryValue* dict = new DictionaryValue; + base::DictionaryValue* dict = new base::DictionaryValue; dict->SetString(kMediaGalleryIdKey, base::Uint64ToString(gallery_id)); dict->SetBoolean(kMediaGalleryHasPermissionKey, has_access); permissions->Append(dict); @@ -1032,13 +1035,13 @@ bool MediaGalleriesPreferences::UnsetGalleryPermissionInPrefs( ExtensionPrefs::ScopedListUpdate update(GetExtensionPrefs(), extension_id, kMediaGalleriesPermissions); - ListValue* permissions = update.Get(); + base::ListValue* permissions = update.Get(); if (!permissions) return false; - for (ListValue::iterator iter = permissions->begin(); + for (base::ListValue::iterator iter = permissions->begin(); iter != permissions->end(); ++iter) { - const DictionaryValue* dict = NULL; + const base::DictionaryValue* dict = NULL; if (!(*iter)->GetAsDictionary(&dict)) continue; MediaGalleryPermission perm; @@ -1057,16 +1060,16 @@ MediaGalleriesPreferences::GetGalleryPermissionsFromPrefs( const std::string& extension_id) const { DCHECK(IsInitialized()); std::vector<MediaGalleryPermission> result; - const ListValue* permissions; + const base::ListValue* permissions; if (!GetExtensionPrefs()->ReadPrefAsList(extension_id, kMediaGalleriesPermissions, &permissions)) { return result; } - for (ListValue::const_iterator iter = permissions->begin(); + for (base::ListValue::const_iterator iter = permissions->begin(); iter != permissions->end(); ++iter) { - DictionaryValue* dict = NULL; + base::DictionaryValue* dict = NULL; if (!(*iter)->GetAsDictionary(&dict)) continue; MediaGalleryPermission perm; @@ -1082,12 +1085,12 @@ void MediaGalleriesPreferences::RemoveGalleryPermissionsFromPrefs( MediaGalleryPrefId gallery_id) { DCHECK(IsInitialized()); ExtensionPrefs* prefs = GetExtensionPrefs(); - const DictionaryValue* extensions = + const base::DictionaryValue* extensions = prefs->pref_service()->GetDictionary(prefs::kExtensionsPref); if (!extensions) return; - for (DictionaryValue::Iterator iter(*extensions); !iter.IsAtEnd(); + for (base::DictionaryValue::Iterator iter(*extensions); !iter.IsAtEnd(); iter.Advance()) { if (!extensions::Extension::IdIsValid(iter.key())) { NOTREACHED(); diff --git a/chrome/browser/media_galleries/media_galleries_test_util.cc b/chrome/browser/media_galleries/media_galleries_test_util.cc index 79ebcc6..692a123 100644 --- a/chrome/browser/media_galleries/media_galleries_test_util.cc +++ b/chrome/browser/media_galleries/media_galleries_test_util.cc @@ -39,22 +39,24 @@ scoped_refptr<extensions::Extension> AddMediaGalleriesApp( const std::string& name, const std::vector<std::string>& media_galleries_permissions, Profile* profile) { - scoped_ptr<DictionaryValue> manifest(new DictionaryValue); + scoped_ptr<base::DictionaryValue> manifest(new base::DictionaryValue); manifest->SetString(extensions::manifest_keys::kName, name); manifest->SetString(extensions::manifest_keys::kVersion, "0.1"); manifest->SetInteger(extensions::manifest_keys::kManifestVersion, 2); - ListValue* background_script_list = new ListValue; - background_script_list->Append(Value::CreateStringValue("background.js")); + base::ListValue* background_script_list = new base::ListValue; + background_script_list->Append( + base::Value::CreateStringValue("background.js")); manifest->Set(extensions::manifest_keys::kPlatformAppBackgroundScripts, background_script_list); - ListValue* permission_detail_list = new ListValue; + base::ListValue* permission_detail_list = new base::ListValue; for (size_t i = 0; i < media_galleries_permissions.size(); i++) permission_detail_list->Append( - Value::CreateStringValue(media_galleries_permissions[i])); - DictionaryValue* media_galleries_permission = new DictionaryValue(); + base::Value::CreateStringValue(media_galleries_permissions[i])); + base::DictionaryValue* media_galleries_permission = + new base::DictionaryValue(); media_galleries_permission->Set("mediaGalleries", permission_detail_list); - ListValue* permission_list = new ListValue; + base::ListValue* permission_list = new base::ListValue; permission_list->Append(media_galleries_permission); manifest->Set(extensions::manifest_keys::kPermissions, permission_list); diff --git a/chrome/browser/metrics/metrics_log.cc b/chrome/browser/metrics/metrics_log.cc index f1d9614..d96d41f 100644 --- a/chrome/browser/metrics/metrics_log.cc +++ b/chrome/browser/metrics/metrics_log.cc @@ -529,7 +529,7 @@ bool MetricsLog::HasStabilityMetrics() const { void MetricsLog::WritePluginStabilityElements(PrefService* pref) { // Now log plugin stability info. - const ListValue* plugin_stats_list = pref->GetList( + const base::ListValue* plugin_stats_list = pref->GetList( prefs::kStabilityPluginStats); if (!plugin_stats_list) return; @@ -537,13 +537,14 @@ void MetricsLog::WritePluginStabilityElements(PrefService* pref) { #if defined(ENABLE_PLUGINS) SystemProfileProto::Stability* stability = uma_proto()->mutable_system_profile()->mutable_stability(); - for (ListValue::const_iterator iter = plugin_stats_list->begin(); + for (base::ListValue::const_iterator iter = plugin_stats_list->begin(); iter != plugin_stats_list->end(); ++iter) { - if (!(*iter)->IsType(Value::TYPE_DICTIONARY)) { + if (!(*iter)->IsType(base::Value::TYPE_DICTIONARY)) { NOTREACHED(); continue; } - DictionaryValue* plugin_dict = static_cast<DictionaryValue*>(*iter); + base::DictionaryValue* plugin_dict = + static_cast<base::DictionaryValue*>(*iter); // Note that this search is potentially a quadratic operation, but given the // low number of plugins installed on a "reasonable" setup, this should be diff --git a/chrome/browser/metrics/metrics_log_serializer.cc b/chrome/browser/metrics/metrics_log_serializer.cc index e25b379..241abef 100644 --- a/chrome/browser/metrics/metrics_log_serializer.cc +++ b/chrome/browser/metrics/metrics_log_serializer.cc @@ -93,7 +93,7 @@ void MetricsLogSerializer::DeserializeLogs( else pref = prefs::kMetricsOngoingLogs; - const ListValue* unsent_logs = local_state->GetList(pref); + const base::ListValue* unsent_logs = local_state->GetList(pref); ReadLogsFromPrefList(*unsent_logs, logs); } @@ -131,7 +131,7 @@ void MetricsLogSerializer::WriteLogsToPrefList( return; // Store size at the beginning of the list. - list->Append(Value::CreateIntegerValue(local_list.size() - start)); + list->Append(base::Value::CreateIntegerValue(local_list.size() - start)); base::MD5Context ctx; base::MD5Init(&ctx); @@ -143,19 +143,19 @@ void MetricsLogSerializer::WriteLogsToPrefList( // take a valid UTF8 string. base::Base64Encode(it->log_text(), &encoded_log); base::MD5Update(&ctx, encoded_log); - list->Append(Value::CreateStringValue(encoded_log)); + list->Append(base::Value::CreateStringValue(encoded_log)); } // Append hash to the end of the list. base::MD5Digest digest; base::MD5Final(&digest, &ctx); - list->Append(Value::CreateStringValue(base::MD5DigestToBase16(digest))); + list->Append(base::Value::CreateStringValue(base::MD5DigestToBase16(digest))); DCHECK(list->GetSize() >= 3); // Minimum of 3 elements (size, data, hash). } // static MetricsLogSerializer::LogReadStatus MetricsLogSerializer::ReadLogsFromPrefList( - const ListValue& list, + const base::ListValue& list, std::vector<MetricsLogManager::SerializedLog>* local_list) { if (list.GetSize() == 0) return MakeRecallStatusHistogram(LIST_EMPTY); @@ -184,7 +184,7 @@ MetricsLogSerializer::LogReadStatus MetricsLogSerializer::ReadLogsFromPrefList( base::MD5Init(&ctx); std::string encoded_log; size_t local_index = 0; - for (ListValue::const_iterator it = list.begin() + 1; + for (base::ListValue::const_iterator it = list.begin() + 1; it != list.end() - 1; // Last element is the checksum. ++it, ++local_index) { bool valid = (*it)->GetAsString(&encoded_log); diff --git a/chrome/browser/metrics/metrics_log_serializer_unittest.cc b/chrome/browser/metrics/metrics_log_serializer_unittest.cc index ce5c5b2..58339402 100644 --- a/chrome/browser/metrics/metrics_log_serializer_unittest.cc +++ b/chrome/browser/metrics/metrics_log_serializer_unittest.cc @@ -23,7 +23,7 @@ void SetLogText(const std::string& log_text, // Store and retrieve empty list. TEST(MetricsLogSerializerTest, EmptyLogList) { - ListValue list; + base::ListValue list; std::vector<MetricsLogManager::SerializedLog> local_list; MetricsLogSerializer::WriteLogsToPrefList(local_list, kListLengthLimit, @@ -39,7 +39,7 @@ TEST(MetricsLogSerializerTest, EmptyLogList) { // Store and retrieve a single log value. TEST(MetricsLogSerializerTest, SingleElementLogList) { - ListValue list; + base::ListValue list; std::vector<MetricsLogManager::SerializedLog> local_list(1); SetLogText("Hello world!", &local_list[0]); @@ -52,7 +52,7 @@ TEST(MetricsLogSerializerTest, SingleElementLogList) { ASSERT_EQ(3U, list.GetSize()); // Examine each element. - ListValue::const_iterator it = list.begin(); + base::ListValue::const_iterator it = list.begin(); int size = 0; (*it)->GetAsInteger(&size); EXPECT_EQ(1, size); @@ -81,7 +81,7 @@ TEST(MetricsLogSerializerTest, SingleElementLogList) { // Store a set of logs over the length limit, but smaller than the min number of // bytes. TEST(MetricsLogSerializerTest, LongButTinyLogList) { - ListValue list; + base::ListValue list; size_t log_count = kListLengthLimit * 5; std::vector<MetricsLogManager::SerializedLog> local_list(log_count); @@ -102,7 +102,7 @@ TEST(MetricsLogSerializerTest, LongButTinyLogList) { // Store a set of logs over the length limit, but that doesn't reach the minimum // number of bytes until after passing the length limit. TEST(MetricsLogSerializerTest, LongButSmallLogList) { - ListValue list; + base::ListValue list; size_t log_count = kListLengthLimit * 5; // Make log_count logs each slightly larger than @@ -135,7 +135,7 @@ TEST(MetricsLogSerializerTest, LongButSmallLogList) { // Store a set of logs within the length limit, but well over the minimum // number of bytes. TEST(MetricsLogSerializerTest, ShortButLargeLogList) { - ListValue list; + base::ListValue list; std::vector<MetricsLogManager::SerializedLog> local_list(kListLengthLimit); // Make the total byte count about twice the minimum. @@ -158,7 +158,7 @@ TEST(MetricsLogSerializerTest, ShortButLargeLogList) { // Store a set of logs over the length limit, and over the minimum number of // bytes. TEST(MetricsLogSerializerTest, LongAndLargeLogList) { - ListValue list; + base::ListValue list; // Include twice the max number of logs. std::vector<MetricsLogManager::SerializedLog> @@ -186,7 +186,7 @@ TEST(MetricsLogSerializerTest, LongAndLargeLogList) { // Induce LIST_SIZE_TOO_SMALL corruption TEST(MetricsLogSerializerTest, SmallRecoveredListSize) { - ListValue list; + base::ListValue list; std::vector<MetricsLogManager::SerializedLog> local_list(1); SetLogText("Hello world!", &local_list[0]); @@ -207,7 +207,7 @@ TEST(MetricsLogSerializerTest, SmallRecoveredListSize) { // Remove size from the stored list. TEST(MetricsLogSerializerTest, RemoveSizeFromLogList) { - ListValue list; + base::ListValue list; std::vector<MetricsLogManager::SerializedLog> local_list(2); SetLogText("one", &local_list[0]); @@ -228,7 +228,7 @@ TEST(MetricsLogSerializerTest, RemoveSizeFromLogList) { // Corrupt size of stored list. TEST(MetricsLogSerializerTest, CorruptSizeOfLogList) { - ListValue list; + base::ListValue list; std::vector<MetricsLogManager::SerializedLog> local_list(1); SetLogText("Hello world!", &local_list[0]); @@ -238,7 +238,7 @@ TEST(MetricsLogSerializerTest, CorruptSizeOfLogList) { EXPECT_EQ(3U, list.GetSize()); // Change list size from 1 to 2. - EXPECT_TRUE(list.Set(0, Value::CreateIntegerValue(2))); + EXPECT_TRUE(list.Set(0, base::Value::CreateIntegerValue(2))); EXPECT_EQ(3U, list.GetSize()); local_list.clear(); @@ -249,7 +249,7 @@ TEST(MetricsLogSerializerTest, CorruptSizeOfLogList) { // Corrupt checksum of stored list. TEST(MetricsLogSerializerTest, CorruptChecksumOfLogList) { - ListValue list; + base::ListValue list; std::vector<MetricsLogManager::SerializedLog> local_list(1); SetLogText("Hello world!", &local_list[0]); @@ -262,7 +262,7 @@ TEST(MetricsLogSerializerTest, CorruptChecksumOfLogList) { std::string checksum; EXPECT_TRUE((*(list.end() - 1))->GetAsString(&checksum)); checksum[0] = (checksum[0] == 'a') ? 'b' : 'a'; - EXPECT_TRUE(list.Set(2, Value::CreateStringValue(checksum))); + EXPECT_TRUE(list.Set(2, base::Value::CreateStringValue(checksum))); EXPECT_EQ(3U, list.GetSize()); local_list.clear(); diff --git a/chrome/browser/metrics/metrics_log_unittest.cc b/chrome/browser/metrics/metrics_log_unittest.cc index a1a1023..bd39ea0 100644 --- a/chrome/browser/metrics/metrics_log_unittest.cc +++ b/chrome/browser/metrics/metrics_log_unittest.cc @@ -382,7 +382,7 @@ TEST_F(MetricsLogTest, Plugins) { EXPECT_FALSE(system_profile.plugin(1).is_pepper()); // Now set some plugin stability stats for p2 and verify they're recorded. - scoped_ptr<base::DictionaryValue> plugin_dict(new DictionaryValue); + scoped_ptr<base::DictionaryValue> plugin_dict(new base::DictionaryValue); plugin_dict->SetString(prefs::kStabilityPluginName, "p2"); plugin_dict->SetInteger(prefs::kStabilityPluginLaunches, 1); plugin_dict->SetInteger(prefs::kStabilityPluginCrashes, 2); diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc index 8c008d7..d220080 100644 --- a/chrome/browser/metrics/metrics_service.cc +++ b/chrome/browser/metrics/metrics_service.cc @@ -1888,17 +1888,18 @@ MetricsService::ChildProcessStats& MetricsService::GetChildProcessStats( void MetricsService::RecordPluginChanges(PrefService* pref) { ListPrefUpdate update(pref, prefs::kStabilityPluginStats); - ListValue* plugins = update.Get(); + base::ListValue* plugins = update.Get(); DCHECK(plugins); - for (ListValue::iterator value_iter = plugins->begin(); + for (base::ListValue::iterator value_iter = plugins->begin(); value_iter != plugins->end(); ++value_iter) { - if (!(*value_iter)->IsType(Value::TYPE_DICTIONARY)) { + if (!(*value_iter)->IsType(base::Value::TYPE_DICTIONARY)) { NOTREACHED(); continue; } - DictionaryValue* plugin_dict = static_cast<DictionaryValue*>(*value_iter); + base::DictionaryValue* plugin_dict = + static_cast<base::DictionaryValue*>(*value_iter); std::string plugin_name; plugin_dict->GetString(prefs::kStabilityPluginName, &plugin_name); if (plugin_name.empty()) { @@ -1958,7 +1959,7 @@ void MetricsService::RecordPluginChanges(PrefService* pref) { // TODO(viettrungluu): remove conversion std::string plugin_name = UTF16ToUTF8(cache_iter->first); - DictionaryValue* plugin_dict = new DictionaryValue; + base::DictionaryValue* plugin_dict = new base::DictionaryValue; plugin_dict->SetString(prefs::kStabilityPluginName, plugin_name); plugin_dict->SetInteger(prefs::kStabilityPluginLaunches, diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/chrome_network_delegate.cc index 57e15d6..c4f9ec9 100644 --- a/chrome/browser/net/chrome_network_delegate.cc +++ b/chrome/browser/net/chrome_network_delegate.cc @@ -410,13 +410,13 @@ void ChromeNetworkDelegate::AllowAccessToAllFiles() { } // static -Value* ChromeNetworkDelegate::HistoricNetworkStatsInfoToValue() { +base::Value* ChromeNetworkDelegate::HistoricNetworkStatsInfoToValue() { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); PrefService* prefs = g_browser_process->local_state(); int64 total_received = prefs->GetInt64(prefs::kHttpReceivedContentLength); int64 total_original = prefs->GetInt64(prefs::kHttpOriginalContentLength); - DictionaryValue* dict = new DictionaryValue(); + base::DictionaryValue* dict = new base::DictionaryValue(); // Use strings to avoid overflow. base::Value only supports 32-bit integers. dict->SetString("historic_received_content_length", base::Int64ToString(total_received)); @@ -425,8 +425,8 @@ Value* ChromeNetworkDelegate::HistoricNetworkStatsInfoToValue() { return dict; } -Value* ChromeNetworkDelegate::SessionNetworkStatsInfoToValue() const { - DictionaryValue* dict = new DictionaryValue(); +base::Value* ChromeNetworkDelegate::SessionNetworkStatsInfoToValue() const { + base::DictionaryValue* dict = new base::DictionaryValue(); // Use strings to avoid overflow. base::Value only supports 32-bit integers. dict->SetString("session_received_content_length", base::Int64ToString(received_content_length_)); diff --git a/chrome/browser/net/chrome_network_delegate.h b/chrome/browser/net/chrome_network_delegate.h index 8160150..e50513e 100644 --- a/chrome/browser/net/chrome_network_delegate.h +++ b/chrome/browser/net/chrome_network_delegate.h @@ -124,11 +124,11 @@ class ChromeNetworkDelegate : public net::NetworkDelegate { // Creates a Value summary of the persistent state of the network session. // The caller is responsible for deleting the returned value. // Must be called on the UI thread. - static Value* HistoricNetworkStatsInfoToValue(); + static base::Value* HistoricNetworkStatsInfoToValue(); // Creates a Value summary of the state of the network session. The caller is // responsible for deleting the returned value. - Value* SessionNetworkStatsInfoToValue() const; + base::Value* SessionNetworkStatsInfoToValue() const; private: friend class ChromeNetworkDelegateTest; diff --git a/chrome/browser/net/firefox_proxy_settings.cc b/chrome/browser/net/firefox_proxy_settings.cc index 9df1dda..2ac0438 100644 --- a/chrome/browser/net/firefox_proxy_settings.cc +++ b/chrome/browser/net/firefox_proxy_settings.cc @@ -65,7 +65,8 @@ FirefoxProxySettings::SOCKSVersion IntToSOCKSVersion(int type) { // |prefs| is not filled). // Note: for strings, only valid UTF-8 string values are supported. If a // key/pair is not valid UTF-8, it is ignored and will not appear in |prefs|. -bool ParsePrefFile(const base::FilePath& pref_file, DictionaryValue* prefs) { +bool ParsePrefFile(const base::FilePath& pref_file, + base::DictionaryValue* prefs) { // The string that is before a pref key. const std::string kUserPrefString = "user_pref(\""; std::string contents; @@ -245,7 +246,7 @@ bool FirefoxProxySettings::ToProxyConfig(net::ProxyConfig* config) { // static bool FirefoxProxySettings::GetSettingsFromFile(const base::FilePath& pref_file, FirefoxProxySettings* settings) { - DictionaryValue dictionary; + base::DictionaryValue dictionary; if (!ParsePrefFile(pref_file, &dictionary)) return false; diff --git a/chrome/browser/net/gaia/gaia_oauth_fetcher.cc b/chrome/browser/net/gaia/gaia_oauth_fetcher.cc index 430ec0c..4a8f537 100644 --- a/chrome/browser/net/gaia/gaia_oauth_fetcher.cc +++ b/chrome/browser/net/gaia/gaia_oauth_fetcher.cc @@ -242,8 +242,9 @@ void GaiaOAuthFetcher::ParseUserInfoResponse(const std::string& data, std::string* email_result) { scoped_ptr<base::Value> value(base::JSONReader::Read(data)); if (value->GetType() == base::Value::TYPE_DICTIONARY) { - Value* email_value; - DictionaryValue* dict = static_cast<DictionaryValue*>(value.get()); + base::Value* email_value; + base::DictionaryValue* dict = + static_cast<base::DictionaryValue*>(value.get()); if (dict->Get("email", &email_value)) { if (email_value->GetType() == base::Value::TYPE_STRING) { email_value->GetAsString(email_result); diff --git a/chrome/browser/net/net_log_temp_file.cc b/chrome/browser/net/net_log_temp_file.cc index f117ae7..bfc7cd1 100644 --- a/chrome/browser/net/net_log_temp_file.cc +++ b/chrome/browser/net/net_log_temp_file.cc @@ -42,7 +42,7 @@ void NetLogTempFile::ProcessCommand(Command command) { } } -DictionaryValue* NetLogTempFile::GetState() { +base::DictionaryValue* NetLogTempFile::GetState() { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE_USER_BLOCKING)); base::DictionaryValue* dict = new base::DictionaryValue; diff --git a/chrome/browser/net/predictor.cc b/chrome/browser/net/predictor.cc index cfa7bad..b6b2b26 100644 --- a/chrome/browser/net/predictor.cc +++ b/chrome/browser/net/predictor.cc @@ -442,7 +442,7 @@ UrlList Predictor::GetPredictedUrlListAtStartup( // This may catch secondary hostnames, pulled in by the homepages. It will // also catch more of the "primary" home pages, since that was (presumably) // rendered first (and will be rendered first this time too). - const ListValue* startup_list = + const base::ListValue* startup_list = user_prefs->GetList(prefs::kDnsPrefetchingStartupList); if (startup_list) { @@ -745,11 +745,11 @@ void Predictor::SerializeReferrers(base::ListValue* referral_list) { for (Referrers::const_iterator it = referrers_.begin(); it != referrers_.end(); ++it) { // Serialize the list of subresource names. - Value* subresource_list(it->second.Serialize()); + base::Value* subresource_list(it->second.Serialize()); // Create a list for each referer. - ListValue* motivator(new ListValue); - motivator->Append(new StringValue(it->first.spec())); + base::ListValue* motivator(new base::ListValue); + motivator->Append(new base::StringValue(it->first.spec())); motivator->Append(subresource_list); referral_list->Append(motivator); @@ -774,7 +774,7 @@ void Predictor::DeserializeReferrers(const base::ListValue& referral_list) { return; } - const Value* subresource_list; + const base::Value* subresource_list; if (!motivator->Get(1, &subresource_list)) { NOTREACHED(); return; @@ -1364,7 +1364,7 @@ void Predictor::InitialObserver::GetInitialDnsResolutionList( it != first_navigations_.end(); ++it) { DCHECK(it->first == Predictor::CanonicalizeUrl(it->first)); - startup_list->Append(new StringValue(it->first.spec())); + startup_list->Append(new base::StringValue(it->first.spec())); } } diff --git a/chrome/browser/net/predictor_unittest.cc b/chrome/browser/net/predictor_unittest.cc index 225c3e3..fff3325 100644 --- a/chrome/browser/net/predictor_unittest.cc +++ b/chrome/browser/net/predictor_unittest.cc @@ -264,14 +264,14 @@ TEST_F(PredictorTest, MassiveConcurrentLookupTest) { // Return a motivation_list if we can find one for the given motivating_host (or // NULL if a match is not found). -static const ListValue* FindSerializationMotivation( +static const base::ListValue* FindSerializationMotivation( const GURL& motivation, - const ListValue* referral_list) { + const base::ListValue* referral_list) { CHECK_LT(0u, referral_list->GetSize()); // Room for version. int format_version = -1; CHECK(referral_list->GetInteger(0, &format_version)); CHECK_EQ(Predictor::kPredictorReferrerVersion, format_version); - const ListValue* motivation_list(NULL); + const base::ListValue* motivation_list(NULL); for (size_t i = 1; i < referral_list->GetSize(); ++i) { referral_list->GetList(i, &motivation_list); std::string existing_spec; @@ -282,14 +282,15 @@ static const ListValue* FindSerializationMotivation( return NULL; } -static ListValue* FindSerializationMotivation(const GURL& motivation, - ListValue* referral_list) { - return const_cast<ListValue*>(FindSerializationMotivation( - motivation, static_cast<const ListValue*>(referral_list))); +static base::ListValue* FindSerializationMotivation( + const GURL& motivation, + base::ListValue* referral_list) { + return const_cast<base::ListValue*>(FindSerializationMotivation( + motivation, static_cast<const base::ListValue*>(referral_list))); } // Create a new empty serialization list. -static ListValue* NewEmptySerializationList() { +static base::ListValue* NewEmptySerializationList() { base::ListValue* list = new base::ListValue; list->Append( new base::FundamentalValue(Predictor::kPredictorReferrerVersion)); @@ -302,22 +303,22 @@ static ListValue* NewEmptySerializationList() { static void AddToSerializedList(const GURL& motivation, const GURL& subresource, double use_rate, - ListValue* referral_list ) { + base::ListValue* referral_list) { // Find the motivation if it is already used. - ListValue* motivation_list = FindSerializationMotivation(motivation, + base::ListValue* motivation_list = FindSerializationMotivation(motivation, referral_list); if (!motivation_list) { // This is the first mention of this motivation, so build a list. - motivation_list = new ListValue; - motivation_list->Append(new StringValue(motivation.spec())); + motivation_list = new base::ListValue; + motivation_list->Append(new base::StringValue(motivation.spec())); // Provide empty subresource list. - motivation_list->Append(new ListValue()); + motivation_list->Append(new base::ListValue()); // ...and make it part of the serialized referral_list. referral_list->Append(motivation_list); } - ListValue* subresource_list(NULL); + base::ListValue* subresource_list(NULL); // 0 == url; 1 == subresource_list. EXPECT_TRUE(motivation_list->GetList(1, &subresource_list)); @@ -335,13 +336,13 @@ static void AddToSerializedList(const GURL& motivation, // Data is written into use_rate arguments. static bool GetDataFromSerialization(const GURL& motivation, const GURL& subresource, - const ListValue& referral_list, + const base::ListValue& referral_list, double* use_rate) { - const ListValue* motivation_list = + const base::ListValue* motivation_list = FindSerializationMotivation(motivation, &referral_list); if (!motivation_list) return false; - const ListValue* subresource_list; + const base::ListValue* subresource_list; EXPECT_TRUE(motivation_list->GetList(1, &subresource_list)); for (size_t i = 0; i < subresource_list->GetSize();) { std::string url_spec; @@ -361,7 +362,7 @@ TEST_F(PredictorTest, ReferrerSerializationNilTest) { Predictor predictor(true); predictor.SetHostResolver(host_resolver_.get()); - scoped_ptr<ListValue> referral_list(NewEmptySerializationList()); + scoped_ptr<base::ListValue> referral_list(NewEmptySerializationList()); predictor.SerializeReferrers(referral_list.get()); EXPECT_EQ(1U, referral_list->GetSize()); EXPECT_FALSE(GetDataFromSerialization( @@ -380,14 +381,14 @@ TEST_F(PredictorTest, ReferrerSerializationSingleReferrerTest) { const GURL motivation_url("http://www.google.com:91"); const GURL subresource_url("http://icons.google.com:90"); const double kUseRate = 23.4; - scoped_ptr<ListValue> referral_list(NewEmptySerializationList()); + scoped_ptr<base::ListValue> referral_list(NewEmptySerializationList()); AddToSerializedList(motivation_url, subresource_url, kUseRate, referral_list.get()); predictor.DeserializeReferrers(*referral_list.get()); - ListValue recovered_referral_list; + base::ListValue recovered_referral_list; predictor.SerializeReferrers(&recovered_referral_list); EXPECT_EQ(2U, recovered_referral_list.GetSize()); double rate; @@ -405,7 +406,7 @@ TEST_F(PredictorTest, GetHtmlReferrerLists) { Predictor predictor(true); predictor.SetHostResolver(host_resolver_.get()); const double kUseRate = 23.4; - scoped_ptr<ListValue> referral_list(NewEmptySerializationList()); + scoped_ptr<base::ListValue> referral_list(NewEmptySerializationList()); AddToSerializedList( GURL("http://d.google.com/x1"), @@ -496,7 +497,7 @@ TEST_F(PredictorTest, ReferrerSerializationTrimTest) { GURL img_subresource_url("http://img.google.com:118"); const double kRateImg = 8.0 * Predictor::kDiscardableExpectedValue; - scoped_ptr<ListValue> referral_list(NewEmptySerializationList()); + scoped_ptr<base::ListValue> referral_list(NewEmptySerializationList()); AddToSerializedList( motivation_url, icon_subresource_url, kRateIcon, referral_list.get()); AddToSerializedList( @@ -504,7 +505,7 @@ TEST_F(PredictorTest, ReferrerSerializationTrimTest) { predictor.DeserializeReferrers(*referral_list.get()); - ListValue recovered_referral_list; + base::ListValue recovered_referral_list; predictor.SerializeReferrers(&recovered_referral_list); EXPECT_EQ(2U, recovered_referral_list.GetSize()); double rate; @@ -678,7 +679,7 @@ TEST_F(PredictorTest, CanonicalizeUrl) { TEST_F(PredictorTest, DiscardPredictorResults) { Predictor predictor(true); predictor.SetHostResolver(host_resolver_.get()); - ListValue referral_list; + base::ListValue referral_list; predictor.SerializeReferrers(&referral_list); EXPECT_EQ(1U, referral_list.GetSize()); diff --git a/chrome/browser/net/pref_proxy_config_tracker_impl.cc b/chrome/browser/net/pref_proxy_config_tracker_impl.cc index fbf5e0c..ccb03cb 100644 --- a/chrome/browser/net/pref_proxy_config_tracker_impl.cc +++ b/chrome/browser/net/pref_proxy_config_tracker_impl.cc @@ -202,14 +202,16 @@ net::ProxyConfigService::ConfigAvailability // static void PrefProxyConfigTrackerImpl::RegisterPrefs(PrefRegistrySimple* registry) { - DictionaryValue* default_settings = ProxyConfigDictionary::CreateSystem(); + base::DictionaryValue* default_settings = + ProxyConfigDictionary::CreateSystem(); registry->RegisterDictionaryPref(prefs::kProxy, default_settings); } // static void PrefProxyConfigTrackerImpl::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* pref_service) { - DictionaryValue* default_settings = ProxyConfigDictionary::CreateSystem(); + base::DictionaryValue* default_settings = + ProxyConfigDictionary::CreateSystem(); pref_service->RegisterDictionaryPref( prefs::kProxy, default_settings, @@ -230,7 +232,8 @@ ProxyPrefs::ConfigState PrefProxyConfigTrackerImpl::ReadPrefConfig( pref_service->FindPreference(prefs::kProxy); DCHECK(pref); - const DictionaryValue* dict = pref_service->GetDictionary(prefs::kProxy); + const base::DictionaryValue* dict = + pref_service->GetDictionary(prefs::kProxy); DCHECK(dict); ProxyConfigDictionary proxy_dict(dict); diff --git a/chrome/browser/net/proxy_policy_handler.cc b/chrome/browser/net/proxy_policy_handler.cc index f1123df..f22ba37 100644 --- a/chrome/browser/net/proxy_policy_handler.cc +++ b/chrome/browser/net/proxy_policy_handler.cc @@ -212,15 +212,15 @@ const base::Value* ProxyPolicyHandler::GetProxyPolicyValue( const PolicyMap& policies, const char* policy_name) { // See note on the ProxyPolicyHandler implementation above. const base::Value* value = policies.GetValue(key::kProxySettings); - const DictionaryValue* settings; + const base::DictionaryValue* settings; if (!value || !value->GetAsDictionary(&settings)) return NULL; const base::Value* policy_value = NULL; std::string tmp; if (!settings->Get(policy_name, &policy_value) || - policy_value->IsType(Value::TYPE_NULL) || - (policy_value->IsType(Value::TYPE_STRING) && + policy_value->IsType(base::Value::TYPE_NULL) || + (policy_value->IsType(base::Value::TYPE_STRING) && policy_value->GetAsString(&tmp) && tmp.empty())) { return NULL; @@ -250,7 +250,7 @@ bool ProxyPolicyHandler::CheckProxyModeAndServerMode(const PolicyMap& policies, errors->AddError(key::kProxySettings, key::kProxyMode, IDS_POLICY_TYPE_ERROR, - ValueTypeToString(Value::TYPE_BOOLEAN)); + ValueTypeToString(base::Value::TYPE_BOOLEAN)); return false; } @@ -279,7 +279,7 @@ bool ProxyPolicyHandler::CheckProxyModeAndServerMode(const PolicyMap& policies, errors->AddError(key::kProxySettings, key::kProxyServerMode, IDS_POLICY_TYPE_ERROR, - ValueTypeToString(Value::TYPE_INTEGER)); + ValueTypeToString(base::Value::TYPE_INTEGER)); return false; } diff --git a/chrome/browser/net/referrer.cc b/chrome/browser/net/referrer.cc index c1902f9..67ac6bf 100644 --- a/chrome/browser/net/referrer.cc +++ b/chrome/browser/net/referrer.cc @@ -120,10 +120,11 @@ bool ReferrerValue::Trim(double reduce_rate, double threshold) { } -void Referrer::Deserialize(const Value& value) { - if (value.GetType() != Value::TYPE_LIST) +void Referrer::Deserialize(const base::Value& value) { + if (value.GetType() != base::Value::TYPE_LIST) return; - const ListValue* subresource_list(static_cast<const ListValue*>(&value)); + const base::ListValue* subresource_list( + static_cast<const base::ListValue*>(&value)); size_t index = 0; // Bounds checking is done by subresource_list->Get*(). while (true) { std::string url_spec; @@ -144,7 +145,7 @@ void Referrer::Deserialize(const Value& value) { } } -Value* Referrer::Serialize() const { +base::Value* Referrer::Serialize() const { base::ListValue* subresource_list(new base::ListValue); for (const_iterator it = begin(); it != end(); ++it) { base::StringValue* url_spec(new base::StringValue(it->first.spec())); diff --git a/chrome/browser/net/spdyproxy/data_reduction_proxy_settings.cc b/chrome/browser/net/spdyproxy/data_reduction_proxy_settings.cc index 5e9e58c..2358b81 100644 --- a/chrome/browser/net/spdyproxy/data_reduction_proxy_settings.cc +++ b/chrome/browser/net/spdyproxy/data_reduction_proxy_settings.cc @@ -87,7 +87,7 @@ const char kEnabled[] = "Enabled"; // http_auth_handler_spdyproxy. const char kAuthenticationRealmName[] = "SpdyProxy"; -int64 GetInt64PrefValue(const ListValue& list_value, size_t index) { +int64 GetInt64PrefValue(const base::ListValue& list_value, size_t index) { int64 val = 0; std::string pref_value; bool rv = list_value.GetString(index, &pref_value); @@ -564,7 +564,7 @@ void DataReductionProxySettings::RecordDataReductionInit() { DataReductionProxySettings::ContentLengthList DataReductionProxySettings::GetDailyContentLengths(const char* pref_name) { DataReductionProxySettings::ContentLengthList content_lengths; - const ListValue* list_value = GetLocalStatePrefs()->GetList(pref_name); + const base::ListValue* list_value = GetLocalStatePrefs()->GetList(pref_name); if (list_value->GetSize() == spdyproxy::kNumDaysInHistory) { for (size_t i = 0; i < spdyproxy::kNumDaysInHistory; ++i) { content_lengths.push_back(GetInt64PrefValue(*list_value, i)); @@ -587,9 +587,9 @@ void DataReductionProxySettings::GetContentLengths( return; } - const ListValue* original_list = + const base::ListValue* original_list = local_state->GetList(prefs::kDailyHttpOriginalContentLength); - const ListValue* received_list = + const base::ListValue* received_list = local_state->GetList(prefs::kDailyHttpReceivedContentLength); if (original_list->GetSize() != spdyproxy::kNumDaysInHistory || diff --git a/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest.cc b/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest.cc index c4dd52b..b632768 100644 --- a/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest.cc +++ b/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest.cc @@ -83,8 +83,9 @@ void DataReductionProxySettingsTestBase::SetUp() { ListPrefUpdate received_update(&pref_service_, prefs::kDailyHttpReceivedContentLength); for (int64 i = 0; i < spdyproxy::kNumDaysInHistory; i++) { - original_update->Insert(0, new StringValue(base::Int64ToString(2 * i))); - received_update->Insert(0, new StringValue(base::Int64ToString(i))); + original_update->Insert(0, + new base::StringValue(base::Int64ToString(2 * i))); + received_update->Insert(0, new base::StringValue(base::Int64ToString(i))); } last_update_time_ = base::Time::Now().LocalMidnight(); pref_service_.SetInt64( @@ -154,7 +155,8 @@ DataReductionProxySettingsTestBase::SetProbeResult< void DataReductionProxySettingsTestBase::CheckProxyPref( const std::string& expected_servers, const std::string& expected_mode) { - const DictionaryValue* dict = pref_service_.GetDictionary(prefs::kProxy); + const base::DictionaryValue* dict = + pref_service_.GetDictionary(prefs::kProxy); std::string mode; std::string server; dict->GetString("mode", &mode); diff --git a/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc b/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc index 6471205..bc40bf1 100644 --- a/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc +++ b/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc @@ -42,7 +42,8 @@ class DataReductionProxySettingsAndroidTest void CheckProxyPacPref(const std::string& expected_pac_url, const std::string& expected_mode) { - const DictionaryValue* dict = pref_service_.GetDictionary(prefs::kProxy); + const base::DictionaryValue* dict = + pref_service_.GetDictionary(prefs::kProxy); std::string mode; std::string pac_url; dict->GetString("mode", &mode); diff --git a/chrome/browser/net/spdyproxy/data_saving_metrics.cc b/chrome/browser/net/spdyproxy/data_saving_metrics.cc index 8deeb41..ffce30f 100644 --- a/chrome/browser/net/spdyproxy/data_saving_metrics.cc +++ b/chrome/browser/net/spdyproxy/data_saving_metrics.cc @@ -43,7 +43,8 @@ void AddInt64ToListPref(size_t index, DCHECK(rv); } value += length; - list_update->Set(index, Value::CreateStringValue(base::Int64ToString(value))); + list_update->Set(index, + base::Value::CreateStringValue(base::Int64ToString(value))); } int64 ListPrefInt64Value(const base::ListValue& list_update, size_t index) { diff --git a/chrome/browser/net/spdyproxy/data_saving_metrics_unittest.cc b/chrome/browser/net/spdyproxy/data_saving_metrics_unittest.cc index 2dac3ee..936f92e 100644 --- a/chrome/browser/net/spdyproxy/data_saving_metrics_unittest.cc +++ b/chrome/browser/net/spdyproxy/data_saving_metrics_unittest.cc @@ -129,7 +129,7 @@ class ChromeNetworkDailyDataSavingMetricsTest ListPrefUpdate update(&pref_service_, pref); update->Clear(); for (size_t i = 0; i < kNumDaysInHistory; ++i) { - update->Insert(0, new StringValue(base::Int64ToString(0))); + update->Insert(0, new base::StringValue(base::Int64ToString(0))); } } diff --git a/chrome/browser/net/ssl_config_service_manager_pref.cc b/chrome/browser/net/ssl_config_service_manager_pref.cc index dc904ca..580b184 100644 --- a/chrome/browser/net/ssl_config_service_manager_pref.cc +++ b/chrome/browser/net/ssl_config_service_manager_pref.cc @@ -27,11 +27,11 @@ namespace { // Converts a ListValue of StringValues into a vector of strings. Any Values // which cannot be converted will be skipped. -std::vector<std::string> ListValueToStringVector(const ListValue* value) { +std::vector<std::string> ListValueToStringVector(const base::ListValue* value) { std::vector<std::string> results; results.reserve(value->GetSize()); std::string s; - for (ListValue::const_iterator it = value->begin(); it != value->end(); + for (base::ListValue::const_iterator it = value->begin(); it != value->end(); ++it) { if (!(*it)->GetAsString(&s)) continue; @@ -311,7 +311,8 @@ void SSLConfigServiceManagerPref::GetSSLConfigFromPrefs( void SSLConfigServiceManagerPref::OnDisabledCipherSuitesChange( PrefService* local_state) { - const ListValue* value = local_state->GetList(prefs::kCipherSuiteBlacklist); + const base::ListValue* value = + local_state->GetList(prefs::kCipherSuiteBlacklist); disabled_cipher_suites_ = ParseCipherSuites(ListValueToStringVector(value)); } diff --git a/chrome/browser/net/ssl_config_service_manager_pref_unittest.cc b/chrome/browser/net/ssl_config_service_manager_pref_unittest.cc index 70b1175..2cbfc05 100644 --- a/chrome/browser/net/ssl_config_service_manager_pref_unittest.cc +++ b/chrome/browser/net/ssl_config_service_manager_pref_unittest.cc @@ -53,7 +53,7 @@ TEST_F(SSLConfigServiceManagerPrefTest, ChannelIDWithoutUserPrefs) { TestingPrefServiceSimple local_state; SSLConfigServiceManager::RegisterPrefs(local_state.registry()); local_state.SetUserPref(prefs::kEnableOriginBoundCerts, - Value::CreateBooleanValue(false)); + base::Value::CreateBooleanValue(false)); scoped_ptr<SSLConfigServiceManager> config_manager( SSLConfigServiceManager::CreateDefaultManager(&local_state)); @@ -66,7 +66,7 @@ TEST_F(SSLConfigServiceManagerPrefTest, ChannelIDWithoutUserPrefs) { EXPECT_FALSE(config.channel_id_enabled); local_state.SetUserPref(prefs::kEnableOriginBoundCerts, - Value::CreateBooleanValue(true)); + base::Value::CreateBooleanValue(true)); // Pump the message loop to notify the SSLConfigServiceManagerPref that the // preferences changed. message_loop_.RunUntilIdle(); @@ -90,9 +90,9 @@ TEST_F(SSLConfigServiceManagerPrefTest, GoodDisabledCipherSuites) { config_service->GetSSLConfig(&old_config); EXPECT_TRUE(old_config.disabled_cipher_suites.empty()); - ListValue* list_value = new ListValue(); - list_value->Append(Value::CreateStringValue("0x0004")); - list_value->Append(Value::CreateStringValue("0x0005")); + base::ListValue* list_value = new base::ListValue(); + list_value->Append(base::Value::CreateStringValue("0x0004")); + list_value->Append(base::Value::CreateStringValue("0x0005")); local_state.SetUserPref(prefs::kCipherSuiteBlacklist, list_value); // Pump the message loop to notify the SSLConfigServiceManagerPref that the @@ -125,11 +125,12 @@ TEST_F(SSLConfigServiceManagerPrefTest, BadDisabledCipherSuites) { config_service->GetSSLConfig(&old_config); EXPECT_TRUE(old_config.disabled_cipher_suites.empty()); - ListValue* list_value = new ListValue(); - list_value->Append(Value::CreateStringValue("0x0004")); - list_value->Append(Value::CreateStringValue("TLS_NOT_WITH_A_CIPHER_SUITE")); - list_value->Append(Value::CreateStringValue("0x0005")); - list_value->Append(Value::CreateStringValue("0xBEEFY")); + base::ListValue* list_value = new base::ListValue(); + list_value->Append(base::Value::CreateStringValue("0x0004")); + list_value->Append( + base::Value::CreateStringValue("TLS_NOT_WITH_A_CIPHER_SUITE")); + list_value->Append(base::Value::CreateStringValue("0x0005")); + list_value->Append(base::Value::CreateStringValue("0xBEEFY")); local_state.SetUserPref(prefs::kCipherSuiteBlacklist, list_value); // Pump the message loop to notify the SSLConfigServiceManagerPref that the diff --git a/chrome/browser/network_time/network_time_service.cc b/chrome/browser/network_time/network_time_service.cc index 9a94a90..82fe9e7 100644 --- a/chrome/browser/network_time/network_time_service.cc +++ b/chrome/browser/network_time/network_time_service.cc @@ -61,7 +61,7 @@ void NetworkTimeService::Shutdown() { // mapping is accurate. base::Time local_now = base::Time::Now(); base::Time network_now = GetNetworkTime(local_now); - DictionaryValue time_mapping; + base::DictionaryValue time_mapping; time_mapping.SetDouble("local", local_now.ToJsTime()); time_mapping.SetDouble("network", network_now.ToJsTime()); profile_->GetPrefs()->Set(prefs::kNetworkTimeMapping, time_mapping); diff --git a/chrome/browser/password_manager/password_manager_metrics_util.cc b/chrome/browser/password_manager/password_manager_metrics_util.cc index 4650123..2a41127 100644 --- a/chrome/browser/password_manager/password_manager_metrics_util.cc +++ b/chrome/browser/password_manager/password_manager_metrics_util.cc @@ -57,7 +57,7 @@ const size_t kNumDomains = arraysize(kDomainMapping); size_t GetGroupIndex(size_t domain_index, PrefService* pref_service) { DCHECK_LT(domain_index, kNumDomains); - const ListValue* group_indices = + const base::ListValue* group_indices = pref_service->GetList(prefs::kPasswordManagerGroupsForDomains); int result = 0; if (!group_indices->GetInteger(domain_index, &result)) { diff --git a/chrome/browser/password_manager/password_manager_unittest.cc b/chrome/browser/password_manager/password_manager_unittest.cc index 2092484..926d7cb 100644 --- a/chrome/browser/password_manager/password_manager_unittest.cc +++ b/chrome/browser/password_manager/password_manager_unittest.cc @@ -477,10 +477,10 @@ TEST_F(PasswordManagerTest, SavingDependsOnManagerEnabledPreference) { // preference. TestingPrefServiceSyncable* prefService = profile()->GetTestingPrefService(); prefService->SetUserPref(prefs::kPasswordManagerEnabled, - Value::CreateBooleanValue(true)); + base::Value::CreateBooleanValue(true)); EXPECT_TRUE(manager()->IsSavingEnabled()); prefService->SetUserPref(prefs::kPasswordManagerEnabled, - Value::CreateBooleanValue(false)); + base::Value::CreateBooleanValue(false)); EXPECT_FALSE(manager()->IsSavingEnabled()); } @@ -492,7 +492,7 @@ TEST_F(PasswordManagerTest, FillPasswordsOnDisabledManager) { result.push_back(existing); TestingPrefServiceSyncable* prefService = profile()->GetTestingPrefService(); prefService->SetUserPref(prefs::kPasswordManagerEnabled, - Value::CreateBooleanValue(false)); + base::Value::CreateBooleanValue(false)); EXPECT_CALL(delegate_, FillPasswordForm(_)); EXPECT_CALL(*store_.get(), GetLogins(_, testing::Eq(PasswordStore::DISALLOW_PROMPT), _)) diff --git a/chrome/browser/performance_monitor/database.cc b/chrome/browser/performance_monitor/database.cc index 4d34ef2..bd2f432c 100644 --- a/chrome/browser/performance_monitor/database.cc +++ b/chrome/browser/performance_monitor/database.cc @@ -57,12 +57,12 @@ double StringToDouble(const std::string& s) { // Returns an event from the given JSON string; the scoped_ptr will be NULL if // we are unable to properly parse the JSON. scoped_ptr<Event> EventFromJSON(const std::string& data) { - Value* value = base::JSONReader::Read(data); - DictionaryValue* dict = NULL; + base::Value* value = base::JSONReader::Read(data); + base::DictionaryValue* dict = NULL; if (!value || !value->GetAsDictionary(&dict)) return scoped_ptr<Event>(); - return Event::FromValue(scoped_ptr<DictionaryValue>(dict)); + return Event::FromValue(scoped_ptr<base::DictionaryValue>(dict)); } } // namespace diff --git a/chrome/browser/performance_monitor/performance_monitor_browsertest.cc b/chrome/browser/performance_monitor/performance_monitor_browsertest.cc index 0fa6655..985baab 100644 --- a/chrome/browser/performance_monitor/performance_monitor_browsertest.cc +++ b/chrome/browser/performance_monitor/performance_monitor_browsertest.cc @@ -85,7 +85,7 @@ struct ExtensionBasicInfo { // Compare the fields of |extension| to those in |value|; this is a check to // make sure the extension data was recorded properly in the event. void ValidateExtensionInfo(const ExtensionBasicInfo extension, - const DictionaryValue* value) { + const base::DictionaryValue* value) { std::string extension_description; std::string extension_id; std::string extension_name; diff --git a/chrome/browser/plugins/plugin_finder.cc b/chrome/browser/plugins/plugin_finder.cc index e6c58f7..9fad8be 100644 --- a/chrome/browser/plugins/plugin_finder.cc +++ b/chrome/browser/plugins/plugin_finder.cc @@ -53,16 +53,16 @@ static base::string16 GetGroupName(const content::WebPluginInfo& plugin) { } void LoadMimeTypes(bool matching_mime_types, - const DictionaryValue* plugin_dict, + const base::DictionaryValue* plugin_dict, PluginMetadata* plugin) { - const ListValue* mime_types = NULL; + const base::ListValue* mime_types = NULL; std::string list_key = matching_mime_types ? "matching_mime_types" : "mime_types"; if (!plugin_dict->GetList(list_key, &mime_types)) return; bool success = false; - for (ListValue::const_iterator mime_type_it = mime_types->begin(); + for (base::ListValue::const_iterator mime_type_it = mime_types->begin(); mime_type_it != mime_types->end(); ++mime_type_it) { std::string mime_type_str; success = (*mime_type_it)->GetAsString(&mime_type_str); @@ -77,7 +77,7 @@ void LoadMimeTypes(bool matching_mime_types, PluginMetadata* CreatePluginMetadata( const std::string& identifier, - const DictionaryValue* plugin_dict) { + const base::DictionaryValue* plugin_dict) { std::string url; bool success = plugin_dict->GetString("url", &url); std::string help_url; @@ -100,11 +100,11 @@ PluginMetadata* CreatePluginMetadata( GURL(help_url), group_name_matcher, language_str); - const ListValue* versions = NULL; + const base::ListValue* versions = NULL; if (plugin_dict->GetList("versions", &versions)) { - for (ListValue::const_iterator it = versions->begin(); + for (base::ListValue::const_iterator it = versions->begin(); it != versions->end(); ++it) { - DictionaryValue* version_dict = NULL; + base::DictionaryValue* version_dict = NULL; if (!(*it)->GetAsDictionary(&version_dict)) { NOTREACHED(); continue; @@ -150,13 +150,13 @@ void PluginFinder::Init() { DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); // Load the built-in plug-in list first. If we have a newer version stored // locally or download one, we will replace this one with it. - scoped_ptr<DictionaryValue> plugin_list(LoadBuiltInPluginList()); + scoped_ptr<base::DictionaryValue> plugin_list(LoadBuiltInPluginList()); DCHECK(plugin_list); ReinitializePlugins(plugin_list.get()); } // static -DictionaryValue* PluginFinder::LoadBuiltInPluginList() { +base::DictionaryValue* PluginFinder::LoadBuiltInPluginList() { base::StringPiece json_resource( ResourceBundle::GetSharedInstance().GetRawDataResource( IDR_PLUGIN_DB_JSON)); @@ -243,9 +243,9 @@ void PluginFinder::ReinitializePlugins( STLDeleteValues(&identifier_plugin_); identifier_plugin_.clear(); - for (DictionaryValue::Iterator plugin_it(*plugin_list); + for (base::DictionaryValue::Iterator plugin_it(*plugin_list); !plugin_it.IsAtEnd(); plugin_it.Advance()) { - const DictionaryValue* plugin = NULL; + const base::DictionaryValue* plugin = NULL; const std::string& identifier = plugin_it.key(); if (plugin_list->GetDictionaryWithoutPathExpansion(identifier, &plugin)) { DCHECK(!identifier_plugin_[identifier]); diff --git a/chrome/browser/plugins/plugin_finder_unittest.cc b/chrome/browser/plugins/plugin_finder_unittest.cc index 5afe3d1..904d176 100644 --- a/chrome/browser/plugins/plugin_finder_unittest.cc +++ b/chrome/browser/plugins/plugin_finder_unittest.cc @@ -12,16 +12,16 @@ using base::DictionaryValue; using base::ListValue; TEST(PluginFinderTest, JsonSyntax) { - scoped_ptr<DictionaryValue> plugin_list( + scoped_ptr<base::DictionaryValue> plugin_list( PluginFinder::LoadBuiltInPluginList()); ASSERT_TRUE(plugin_list.get()); scoped_ptr<base::Value> version; ASSERT_TRUE(plugin_list->Remove("x-version", &version)); EXPECT_EQ(base::Value::TYPE_INTEGER, version->GetType()); - for (DictionaryValue::Iterator plugin_it(*plugin_list); + for (base::DictionaryValue::Iterator plugin_it(*plugin_list); !plugin_it.IsAtEnd(); plugin_it.Advance()) { - const DictionaryValue* plugin = NULL; + const base::DictionaryValue* plugin = NULL; ASSERT_TRUE(plugin_it.value().GetAsDictionary(&plugin)); std::string dummy_str; bool dummy_bool; @@ -36,29 +36,29 @@ TEST(PluginFinderTest, JsonSyntax) { EXPECT_TRUE(plugin->GetBoolean("displayurl", &dummy_bool)); if (plugin->HasKey("requires_authorization")) EXPECT_TRUE(plugin->GetBoolean("requires_authorization", &dummy_bool)); - const ListValue* mime_types = NULL; + const base::ListValue* mime_types = NULL; if (plugin->GetList("mime_types", &mime_types)) { - for (ListValue::const_iterator mime_type_it = mime_types->begin(); + for (base::ListValue::const_iterator mime_type_it = mime_types->begin(); mime_type_it != mime_types->end(); ++mime_type_it) { EXPECT_TRUE((*mime_type_it)->GetAsString(&dummy_str)); } } - const ListValue* matching_mime_types = NULL; + const base::ListValue* matching_mime_types = NULL; if (plugin->GetList("matching_mime_types", &matching_mime_types)) { - for (ListValue::const_iterator it = matching_mime_types->begin(); + for (base::ListValue::const_iterator it = matching_mime_types->begin(); it != matching_mime_types->end(); ++it) { EXPECT_TRUE((*it)->GetAsString(&dummy_str)); } } - const ListValue* versions = NULL; + const base::ListValue* versions = NULL; if (!plugin->GetList("versions", &versions)) continue; - for (ListValue::const_iterator it = versions->begin(); + for (base::ListValue::const_iterator it = versions->begin(); it != versions->end(); ++it) { - DictionaryValue* version_dict = NULL; + base::DictionaryValue* version_dict = NULL; ASSERT_TRUE((*it)->GetAsDictionary(&version_dict)); EXPECT_TRUE(version_dict->GetString("version", &dummy_str)); std::string status_str; diff --git a/chrome/browser/plugins/plugin_prefs.cc b/chrome/browser/plugins/plugin_prefs.cc index 73d99fe..9449316 100644 --- a/chrome/browser/plugins/plugin_prefs.cc +++ b/chrome/browser/plugins/plugin_prefs.cc @@ -290,13 +290,13 @@ bool PluginPrefs::IsStringMatchedInSet( } /* static */ -void PluginPrefs::ListValueToStringSet(const ListValue* src, +void PluginPrefs::ListValueToStringSet(const base::ListValue* src, std::set<base::string16>* dest) { DCHECK(src); DCHECK(dest); dest->clear(); - ListValue::const_iterator end(src->end()); - for (ListValue::const_iterator current(src->begin()); + base::ListValue::const_iterator end(src->end()); + for (base::ListValue::const_iterator current(src->begin()); current != end; ++current) { base::string16 plugin_name; if ((*current)->GetAsString(&plugin_name)) { @@ -346,13 +346,13 @@ void PluginPrefs::SetPrefs(PrefService* prefs) { { // Scoped update of prefs::kPluginsPluginsList. ListPrefUpdate update(prefs_, prefs::kPluginsPluginsList); - ListValue* saved_plugins_list = update.Get(); + base::ListValue* saved_plugins_list = update.Get(); if (saved_plugins_list && !saved_plugins_list->empty()) { // The following four variables are only valid when // |migrate_to_pepper_flash| is set to true. base::FilePath npapi_flash; base::FilePath pepper_flash; - DictionaryValue* pepper_flash_node = NULL; + base::DictionaryValue* pepper_flash_node = NULL; bool npapi_flash_enabled = false; if (migrate_to_pepper_flash) { PathService::Get(chrome::FILE_FLASH_PLUGIN, &npapi_flash); @@ -360,18 +360,19 @@ void PluginPrefs::SetPrefs(PrefService* prefs) { } // Used when |remove_component_pepper_flash_settings| is set to true. - ListValue::iterator component_pepper_flash_node = + base::ListValue::iterator component_pepper_flash_node = saved_plugins_list->end(); - for (ListValue::iterator it = saved_plugins_list->begin(); + for (base::ListValue::iterator it = saved_plugins_list->begin(); it != saved_plugins_list->end(); ++it) { - if (!(*it)->IsType(Value::TYPE_DICTIONARY)) { + if (!(*it)->IsType(base::Value::TYPE_DICTIONARY)) { LOG(WARNING) << "Invalid entry in " << prefs::kPluginsPluginsList; continue; // Oops, don't know what to do with this item. } - DictionaryValue* plugin = static_cast<DictionaryValue*>(*it); + base::DictionaryValue* plugin = + static_cast<base::DictionaryValue*>(*it); base::string16 group_name; bool enabled; if (!plugin->GetBoolean("enabled", &enabled)) @@ -530,7 +531,7 @@ void PluginPrefs::OnUpdatePreferences( PluginFinder* finder = PluginFinder::GetInstance(); ListPrefUpdate update(prefs_, prefs::kPluginsPluginsList); - ListValue* plugins_list = update.Get(); + base::ListValue* plugins_list = update.Get(); plugins_list->Clear(); base::FilePath internal_dir; @@ -542,7 +543,7 @@ void PluginPrefs::OnUpdatePreferences( // Add the plugin files. std::set<base::string16> group_names; for (size_t i = 0; i < plugins.size(); ++i) { - DictionaryValue* summary = new DictionaryValue(); + base::DictionaryValue* summary = new base::DictionaryValue(); summary->SetString("path", plugins[i].path.value()); summary->SetString("name", plugins[i].name); summary->SetString("version", plugins[i].version); @@ -560,7 +561,7 @@ void PluginPrefs::OnUpdatePreferences( // Add the plug-in groups. for (std::set<base::string16>::const_iterator it = group_names.begin(); it != group_names.end(); ++it) { - DictionaryValue* summary = new DictionaryValue(); + base::DictionaryValue* summary = new base::DictionaryValue(); summary->SetString("name", *it); bool enabled = true; std::map<base::string16, bool>::iterator gstate_it = diff --git a/chrome/browser/plugins/plugins_resource_service.cc b/chrome/browser/plugins/plugins_resource_service.cc index e8ce1ab..d956fb8 100644 --- a/chrome/browser/plugins/plugins_resource_service.cc +++ b/chrome/browser/plugins/plugins_resource_service.cc @@ -79,7 +79,7 @@ void PluginsResourceService::RegisterPrefs(PrefRegistrySimple* registry) { registry->RegisterStringPref(prefs::kPluginsResourceCacheUpdate, "0"); } -void PluginsResourceService::Unpack(const DictionaryValue& parsed_json) { +void PluginsResourceService::Unpack(const base::DictionaryValue& parsed_json) { prefs_->Set(prefs::kPluginsMetadata, parsed_json); PluginFinder::GetInstance()->ReinitializePlugins(&parsed_json); } diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc b/chrome/browser/policy/configuration_policy_handler_list_factory.cc index ed23216..c09d1ed 100644 --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc @@ -55,396 +55,396 @@ namespace { const PolicyToPreferenceMapEntry kSimplePolicyMap[] = { { key::kHomepageLocation, prefs::kHomePage, - Value::TYPE_STRING }, + base::Value::TYPE_STRING }, { key::kHomepageIsNewTabPage, prefs::kHomePageIsNewTabPage, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kRestoreOnStartupURLs, prefs::kURLsToRestoreOnStartup, - Value::TYPE_LIST }, + base::Value::TYPE_LIST }, { key::kAlternateErrorPagesEnabled, prefs::kAlternateErrorPagesEnabled, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kSearchSuggestEnabled, prefs::kSearchSuggestEnabled, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kDnsPrefetchingEnabled, prefs::kNetworkPredictionEnabled, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kBuiltInDnsClientEnabled, prefs::kBuiltInDnsClientEnabled, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kDisableSpdy, prefs::kDisableSpdy, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kSafeBrowsingEnabled, prefs::kSafeBrowsingEnabled, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kForceSafeSearch, prefs::kForceSafeSearch, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kPasswordManagerEnabled, prefs::kPasswordManagerEnabled, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kPasswordManagerAllowShowPasswords, prefs::kPasswordManagerAllowShowPasswords, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kPrintingEnabled, prefs::kPrintingEnabled, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kDisablePrintPreview, prefs::kPrintPreviewDisabled, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kMetricsReportingEnabled, prefs::kMetricsReportingEnabled, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kApplicationLocaleValue, prefs::kApplicationLocale, - Value::TYPE_STRING }, + base::Value::TYPE_STRING }, { key::kDisabledPlugins, prefs::kPluginsDisabledPlugins, - Value::TYPE_LIST }, + base::Value::TYPE_LIST }, { key::kDisabledPluginsExceptions, prefs::kPluginsDisabledPluginsExceptions, - Value::TYPE_LIST }, + base::Value::TYPE_LIST }, { key::kEnabledPlugins, prefs::kPluginsEnabledPlugins, - Value::TYPE_LIST }, + base::Value::TYPE_LIST }, { key::kShowHomeButton, prefs::kShowHomeButton, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kSavingBrowserHistoryDisabled, prefs::kSavingBrowserHistoryDisabled, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kAllowDeletingBrowserHistory, prefs::kAllowDeletingBrowserHistory, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kDeveloperToolsDisabled, prefs::kDevToolsDisabled, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kBlockThirdPartyCookies, prefs::kBlockThirdPartyCookies, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kDefaultCookiesSetting, prefs::kManagedDefaultCookiesSetting, - Value::TYPE_INTEGER }, + base::Value::TYPE_INTEGER }, { key::kDefaultImagesSetting, prefs::kManagedDefaultImagesSetting, - Value::TYPE_INTEGER }, + base::Value::TYPE_INTEGER }, { key::kDefaultPluginsSetting, prefs::kManagedDefaultPluginsSetting, - Value::TYPE_INTEGER }, + base::Value::TYPE_INTEGER }, { key::kDefaultPopupsSetting, prefs::kManagedDefaultPopupsSetting, - Value::TYPE_INTEGER }, + base::Value::TYPE_INTEGER }, { key::kAutoSelectCertificateForUrls, prefs::kManagedAutoSelectCertificateForUrls, - Value::TYPE_LIST }, + base::Value::TYPE_LIST }, { key::kCookiesAllowedForUrls, prefs::kManagedCookiesAllowedForUrls, - Value::TYPE_LIST }, + base::Value::TYPE_LIST }, { key::kCookiesBlockedForUrls, prefs::kManagedCookiesBlockedForUrls, - Value::TYPE_LIST }, + base::Value::TYPE_LIST }, { key::kCookiesSessionOnlyForUrls, prefs::kManagedCookiesSessionOnlyForUrls, - Value::TYPE_LIST }, + base::Value::TYPE_LIST }, { key::kImagesAllowedForUrls, prefs::kManagedImagesAllowedForUrls, - Value::TYPE_LIST }, + base::Value::TYPE_LIST }, { key::kImagesBlockedForUrls, prefs::kManagedImagesBlockedForUrls, - Value::TYPE_LIST }, + base::Value::TYPE_LIST }, { key::kJavaScriptAllowedForUrls, prefs::kManagedJavaScriptAllowedForUrls, - Value::TYPE_LIST }, + base::Value::TYPE_LIST }, { key::kJavaScriptBlockedForUrls, prefs::kManagedJavaScriptBlockedForUrls, - Value::TYPE_LIST }, + base::Value::TYPE_LIST }, { key::kPluginsAllowedForUrls, prefs::kManagedPluginsAllowedForUrls, - Value::TYPE_LIST }, + base::Value::TYPE_LIST }, { key::kPluginsBlockedForUrls, prefs::kManagedPluginsBlockedForUrls, - Value::TYPE_LIST }, + base::Value::TYPE_LIST }, { key::kPopupsAllowedForUrls, prefs::kManagedPopupsAllowedForUrls, - Value::TYPE_LIST }, + base::Value::TYPE_LIST }, { key::kPopupsBlockedForUrls, prefs::kManagedPopupsBlockedForUrls, - Value::TYPE_LIST }, + base::Value::TYPE_LIST }, { key::kNotificationsAllowedForUrls, prefs::kManagedNotificationsAllowedForUrls, - Value::TYPE_LIST }, + base::Value::TYPE_LIST }, { key::kNotificationsBlockedForUrls, prefs::kManagedNotificationsBlockedForUrls, - Value::TYPE_LIST }, + base::Value::TYPE_LIST }, { key::kDefaultNotificationsSetting, prefs::kManagedDefaultNotificationsSetting, - Value::TYPE_INTEGER }, + base::Value::TYPE_INTEGER }, { key::kDefaultGeolocationSetting, prefs::kManagedDefaultGeolocationSetting, - Value::TYPE_INTEGER }, + base::Value::TYPE_INTEGER }, { key::kSigninAllowed, prefs::kSigninAllowed, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kEnableOriginBoundCerts, prefs::kEnableOriginBoundCerts, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kDisableSSLRecordSplitting, prefs::kDisableSSLRecordSplitting, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kEnableOnlineRevocationChecks, prefs::kCertRevocationCheckingEnabled, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kRequireOnlineRevocationChecksForLocalAnchors, prefs::kCertRevocationCheckingRequiredLocalAnchors, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kAuthSchemes, prefs::kAuthSchemes, - Value::TYPE_STRING }, + base::Value::TYPE_STRING }, { key::kDisableAuthNegotiateCnameLookup, prefs::kDisableAuthNegotiateCnameLookup, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kEnableAuthNegotiatePort, prefs::kEnableAuthNegotiatePort, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kAuthServerWhitelist, prefs::kAuthServerWhitelist, - Value::TYPE_STRING }, + base::Value::TYPE_STRING }, { key::kAuthNegotiateDelegateWhitelist, prefs::kAuthNegotiateDelegateWhitelist, - Value::TYPE_STRING }, + base::Value::TYPE_STRING }, { key::kGSSAPILibraryName, prefs::kGSSAPILibraryName, - Value::TYPE_STRING }, + base::Value::TYPE_STRING }, { key::kAllowCrossOriginAuthPrompt, prefs::kAllowCrossOriginAuthPrompt, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kDisable3DAPIs, prefs::kDisable3DAPIs, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kDisablePluginFinder, prefs::kDisablePluginFinder, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kDiskCacheSize, prefs::kDiskCacheSize, - Value::TYPE_INTEGER }, + base::Value::TYPE_INTEGER }, { key::kMediaCacheSize, prefs::kMediaCacheSize, - Value::TYPE_INTEGER }, + base::Value::TYPE_INTEGER }, { key::kPolicyRefreshRate, policy_prefs::kUserPolicyRefreshRate, - Value::TYPE_INTEGER }, + base::Value::TYPE_INTEGER }, { key::kDevicePolicyRefreshRate, prefs::kDevicePolicyRefreshRate, - Value::TYPE_INTEGER }, + base::Value::TYPE_INTEGER }, { key::kDefaultBrowserSettingEnabled, prefs::kDefaultBrowserSettingEnabled, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kRemoteAccessHostFirewallTraversal, prefs::kRemoteAccessHostFirewallTraversal, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kRemoteAccessHostRequireTwoFactor, prefs::kRemoteAccessHostRequireTwoFactor, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kRemoteAccessHostDomain, prefs::kRemoteAccessHostDomain, - Value::TYPE_STRING }, + base::Value::TYPE_STRING }, { key::kRemoteAccessHostTalkGadgetPrefix, prefs::kRemoteAccessHostTalkGadgetPrefix, - Value::TYPE_STRING }, + base::Value::TYPE_STRING }, { key::kRemoteAccessHostRequireCurtain, prefs::kRemoteAccessHostRequireCurtain, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kRemoteAccessHostAllowClientPairing, prefs::kRemoteAccessHostAllowClientPairing, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kCloudPrintProxyEnabled, prefs::kCloudPrintProxyEnabled, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kCloudPrintSubmitEnabled, prefs::kCloudPrintSubmitEnabled, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kTranslateEnabled, prefs::kEnableTranslate, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kAllowOutdatedPlugins, prefs::kPluginsAllowOutdated, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kAlwaysAuthorizePlugins, prefs::kPluginsAlwaysAuthorize, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kBookmarkBarEnabled, prefs::kShowBookmarkBar, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kEditBookmarksEnabled, prefs::kEditBookmarksEnabled, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kAllowFileSelectionDialogs, prefs::kAllowFileSelectionDialogs, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kImportBookmarks, prefs::kImportBookmarks, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kImportHistory, prefs::kImportHistory, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kImportHomepage, prefs::kImportHomepage, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kImportSearchEngine, prefs::kImportSearchEngine, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kImportSavedPasswords, prefs::kImportSavedPasswords, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kMaxConnectionsPerProxy, prefs::kMaxConnectionsPerProxy, - Value::TYPE_INTEGER }, + base::Value::TYPE_INTEGER }, { key::kURLWhitelist, policy_prefs::kUrlWhitelist, - Value::TYPE_LIST }, + base::Value::TYPE_LIST }, { key::kEnableMemoryInfo, prefs::kEnableMemoryInfo, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kRestrictSigninToPattern, prefs::kGoogleServicesUsernamePattern, - Value::TYPE_STRING }, + base::Value::TYPE_STRING }, { key::kDefaultMediaStreamSetting, prefs::kManagedDefaultMediaStreamSetting, - Value::TYPE_INTEGER }, + base::Value::TYPE_INTEGER }, { key::kDisableSafeBrowsingProceedAnyway, prefs::kSafeBrowsingProceedAnywayDisabled, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kSpellCheckServiceEnabled, prefs::kSpellCheckUseSpellingService, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kDisableScreenshots, prefs::kDisableScreenshots, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kAudioCaptureAllowed, prefs::kAudioCaptureAllowed, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kVideoCaptureAllowed, prefs::kVideoCaptureAllowed, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kAudioCaptureAllowedUrls, prefs::kAudioCaptureAllowedUrls, - Value::TYPE_LIST }, + base::Value::TYPE_LIST }, { key::kVideoCaptureAllowedUrls, prefs::kVideoCaptureAllowedUrls, - Value::TYPE_LIST }, + base::Value::TYPE_LIST }, { key::kHideWebStoreIcon, prefs::kHideWebStoreIcon, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kVariationsRestrictParameter, prefs::kVariationsRestrictParameter, - Value::TYPE_STRING }, + base::Value::TYPE_STRING }, { key::kSupervisedUserCreationEnabled, prefs::kManagedUserCreationAllowed, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kForceEphemeralProfiles, prefs::kForceEphemeralProfiles, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, #if !defined(OS_MACOSX) { key::kFullscreenAllowed, prefs::kFullscreenAllowed, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kFullscreenAllowed, apps::prefs::kAppFullscreenAllowed, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, #endif // !defined(OS_MACOSX) #if defined(OS_CHROMEOS) { key::kChromeOsLockOnIdleSuspend, prefs::kEnableScreenLock, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kChromeOsReleaseChannel, prefs::kChromeOsReleaseChannel, - Value::TYPE_STRING }, + base::Value::TYPE_STRING }, { key::kDriveDisabled, prefs::kDisableDrive, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kDriveDisabledOverCellular, prefs::kDisableDriveOverCellular, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kExternalStorageDisabled, prefs::kExternalStorageDisabled, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kAudioOutputAllowed, prefs::kAudioOutputAllowed, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kShowLogoutButtonInTray, prefs::kShowLogoutButtonInTray, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kShelfAutoHideBehavior, prefs::kShelfAutoHideBehaviorLocal, - Value::TYPE_STRING }, + base::Value::TYPE_STRING }, { key::kSessionLengthLimit, prefs::kSessionLengthLimit, - Value::TYPE_INTEGER }, + base::Value::TYPE_INTEGER }, { key::kWaitForInitialUserActivity, prefs::kSessionWaitForInitialUserActivity, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kPowerManagementUsesAudioActivity, prefs::kPowerUseAudioActivity, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kPowerManagementUsesVideoActivity, prefs::kPowerUseVideoActivity, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kAllowScreenWakeLocks, prefs::kPowerAllowScreenWakeLocks, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kWaitForInitialUserActivity, prefs::kPowerWaitForInitialUserActivity, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kTermsOfServiceURL, prefs::kTermsOfServiceURL, - Value::TYPE_STRING }, + base::Value::TYPE_STRING }, { key::kShowAccessibilityOptionsInSystemTrayMenu, prefs::kShouldAlwaysShowAccessibilityMenu, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kLargeCursorEnabled, prefs::kLargeCursorEnabled, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kSpokenFeedbackEnabled, prefs::kSpokenFeedbackEnabled, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kHighContrastEnabled, prefs::kHighContrastEnabled, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kDeviceLoginScreenDefaultLargeCursorEnabled, NULL, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kDeviceLoginScreenDefaultSpokenFeedbackEnabled, NULL, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kDeviceLoginScreenDefaultHighContrastEnabled, NULL, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kRebootAfterUpdate, prefs::kRebootAfterUpdate, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kAttestationEnabledForUser, prefs::kAttestationEnabled, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, { key::kChromeOsMultiProfileUserBehavior, prefs::kMultiProfileUserBehavior, - Value::TYPE_STRING }, + base::Value::TYPE_STRING }, #endif // defined(OS_CHROMEOS) #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) { key::kBackgroundModeEnabled, prefs::kBackgroundModeEnabled, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, #endif // !defined(OS_MACOSX) && !defined(OS_CHROMEOS) #if defined(OS_ANDROID) { key::kDataCompressionProxyEnabled, prefs::kSpdyProxyAuthEnabled, - Value::TYPE_BOOLEAN }, + base::Value::TYPE_BOOLEAN }, #endif // defined(OS_ANDROID) }; diff --git a/chrome/browser/policy/policy_prefs_browsertest.cc b/chrome/browser/policy/policy_prefs_browsertest.cc index 60baa1a..80b7202 100644 --- a/chrome/browser/policy/policy_prefs_browsertest.cc +++ b/chrome/browser/policy/policy_prefs_browsertest.cc @@ -468,7 +468,8 @@ class PolicyPrefsTest : public InProcessBrowserTest { void SetProviderPolicy(const base::DictionaryValue& policies, PolicyLevel level) { PolicyMap policy_map; - for (DictionaryValue::Iterator it(policies); !it.IsAtEnd(); it.Advance()) { + for (base::DictionaryValue::Iterator it(policies); + !it.IsAtEnd(); it.Advance()) { const PolicyDetails* policy_details = GetChromePolicyDetails(it.key()); ASSERT_TRUE(policy_details); policy_map.Set( diff --git a/chrome/browser/policy/url_blacklist_manager_unittest.cc b/chrome/browser/policy/url_blacklist_manager_unittest.cc index 27d3307..cc5926b 100644 --- a/chrome/browser/policy/url_blacklist_manager_unittest.cc +++ b/chrome/browser/policy/url_blacklist_manager_unittest.cc @@ -183,10 +183,10 @@ TEST_P(URLBlacklistFilterToComponentsTest, FilterToComponents) { } TEST_F(URLBlacklistManagerTest, SingleUpdateForTwoPrefChanges) { - ListValue* blacklist = new ListValue; - blacklist->Append(new StringValue("*.google.com")); - ListValue* whitelist = new ListValue; - whitelist->Append(new StringValue("mail.google.com")); + base::ListValue* blacklist = new base::ListValue; + blacklist->Append(new base::StringValue("*.google.com")); + base::ListValue* whitelist = new base::ListValue; + whitelist->Append(new base::StringValue("mail.google.com")); pref_service_.SetManagedPref(policy_prefs::kUrlBlacklist, blacklist); pref_service_.SetManagedPref(policy_prefs::kUrlBlacklist, whitelist); loop_.RunUntilIdle(); diff --git a/chrome/browser/policy/url_blacklist_policy_handler.cc b/chrome/browser/policy/url_blacklist_policy_handler.cc index 5bc2385..8e51f90 100644 --- a/chrome/browser/policy/url_blacklist_policy_handler.cc +++ b/chrome/browser/policy/url_blacklist_policy_handler.cc @@ -71,7 +71,7 @@ void URLBlacklistPolicyHandler::ApplyPolicySettings(const PolicyMap& policies, if (url_blacklist) { for (base::ListValue::const_iterator entry(url_blacklist->begin()); entry != url_blacklist->end(); ++entry) { - if ((*entry)->IsType(Value::TYPE_STRING)) + if ((*entry)->IsType(base::Value::TYPE_STRING)) merged_url_blacklist->Append((*entry)->DeepCopy()); } } diff --git a/chrome/browser/pref_service_flags_storage.cc b/chrome/browser/pref_service_flags_storage.cc index 751ac1e1..6fdc8c4 100644 --- a/chrome/browser/pref_service_flags_storage.cc +++ b/chrome/browser/pref_service_flags_storage.cc @@ -17,10 +17,10 @@ PrefServiceFlagsStorage::PrefServiceFlagsStorage( PrefServiceFlagsStorage::~PrefServiceFlagsStorage() {} std::set<std::string> PrefServiceFlagsStorage::GetFlags() { - const ListValue* enabled_experiments = prefs_->GetList( + const base::ListValue* enabled_experiments = prefs_->GetList( prefs::kEnabledLabsExperiments); std::set<std::string> flags; - for (ListValue::const_iterator it = enabled_experiments->begin(); + for (base::ListValue::const_iterator it = enabled_experiments->begin(); it != enabled_experiments->end(); ++it) { std::string experiment_name; @@ -35,12 +35,12 @@ std::set<std::string> PrefServiceFlagsStorage::GetFlags() { bool PrefServiceFlagsStorage::SetFlags(const std::set<std::string>& flags) { ListPrefUpdate update(prefs_, prefs::kEnabledLabsExperiments); - ListValue* experiments_list = update.Get(); + base::ListValue* experiments_list = update.Get(); experiments_list->Clear(); for (std::set<std::string>::const_iterator it = flags.begin(); it != flags.end(); ++it) { - experiments_list->Append(new StringValue(*it)); + experiments_list->Append(new base::StringValue(*it)); } return true; diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc index 6389f10..d6b9f73 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc @@ -459,7 +459,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { // key) go here. registry->RegisterDictionaryPref( kBackupPref, - new DictionaryValue(), + new base::DictionaryValue(), user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); #if !defined(OS_ANDROID) registry->RegisterStringPref( diff --git a/chrome/browser/prefs/chrome_pref_service_unittest.cc b/chrome/browser/prefs/chrome_pref_service_unittest.cc index ba8a013..0513ca0 100644 --- a/chrome/browser/prefs/chrome_pref_service_unittest.cc +++ b/chrome/browser/prefs/chrome_pref_service_unittest.cc @@ -37,9 +37,9 @@ TEST(ChromePrefServiceTest, UpdateCommandLinePrefStore) { const PrefService::Preference* pref = prefs.FindPreference(prefs::kCloudPrintProxyEnabled); ASSERT_TRUE(pref); - const Value* value = pref->GetValue(); + const base::Value* value = pref->GetValue(); ASSERT_TRUE(value); - EXPECT_EQ(Value::TYPE_BOOLEAN, value->GetType()); + EXPECT_EQ(base::Value::TYPE_BOOLEAN, value->GetType()); bool actual_bool_value = true; EXPECT_TRUE(value->GetAsBoolean(&actual_bool_value)); EXPECT_FALSE(actual_bool_value); @@ -54,7 +54,7 @@ TEST(ChromePrefServiceTest, UpdateCommandLinePrefStore) { ASSERT_TRUE(pref); value = pref->GetValue(); ASSERT_TRUE(value); - EXPECT_EQ(Value::TYPE_BOOLEAN, value->GetType()); + EXPECT_EQ(base::Value::TYPE_BOOLEAN, value->GetType()); actual_bool_value = false; EXPECT_TRUE(value->GetAsBoolean(&actual_bool_value)); EXPECT_TRUE(actual_bool_value); @@ -101,18 +101,18 @@ class ChromePrefServiceWebKitPrefs : public ChromeRenderViewHostTestHarness { profile()->GetTestingPrefService(); #if defined(TOOLKIT_GTK) pref_services->SetUserPref(prefs::kUsesSystemTheme, - Value::CreateBooleanValue(false)); + base::Value::CreateBooleanValue(false)); #endif pref_services->SetUserPref(prefs::kDefaultCharset, - Value::CreateStringValue("utf8")); + base::Value::CreateStringValue("utf8")); pref_services->SetUserPref(prefs::kWebKitDefaultFontSize, - Value::CreateIntegerValue(20)); + base::Value::CreateIntegerValue(20)); pref_services->SetUserPref(prefs::kWebKitTextAreasAreResizable, - Value::CreateBooleanValue(false)); + base::Value::CreateBooleanValue(false)); pref_services->SetUserPref(prefs::kWebKitUsesUniversalDetector, - Value::CreateBooleanValue(true)); + base::Value::CreateBooleanValue(true)); pref_services->SetUserPref("webkit.webprefs.foo", - Value::CreateStringValue("bar")); + base::Value::CreateStringValue("bar")); } }; diff --git a/chrome/browser/prefs/command_line_pref_store.cc b/chrome/browser/prefs/command_line_pref_store.cc index 8c1e9dd..ea4238b 100644 --- a/chrome/browser/prefs/command_line_pref_store.cc +++ b/chrome/browser/prefs/command_line_pref_store.cc @@ -111,7 +111,7 @@ void CommandLinePrefStore::ApplySimpleSwitches() { // Look for each switch we know about and set its preference accordingly. for (size_t i = 0; i < arraysize(string_switch_map_); ++i) { if (command_line_->HasSwitch(string_switch_map_[i].switch_name)) { - Value* value = Value::CreateStringValue(command_line_-> + base::Value* value = base::Value::CreateStringValue(command_line_-> GetSwitchValueASCII(string_switch_map_[i].switch_name)); SetValue(string_switch_map_[i].preference_path, value); } @@ -128,14 +128,14 @@ void CommandLinePrefStore::ApplySimpleSwitches() { << " can not be converted to integer, ignoring!"; continue; } - Value* value = Value::CreateIntegerValue(int_value); + base::Value* value = base::Value::CreateIntegerValue(int_value); SetValue(integer_switch_map_[i].preference_path, value); } } for (size_t i = 0; i < arraysize(boolean_switch_map_); ++i) { if (command_line_->HasSwitch(boolean_switch_map_[i].switch_name)) { - Value* value = Value::CreateBooleanValue( + base::Value* value = base::Value::CreateBooleanValue( boolean_switch_map_[i].set_value); SetValue(boolean_switch_map_[i].preference_path, value); } @@ -183,7 +183,7 @@ void CommandLinePrefStore::ApplySSLSwitches() { void CommandLinePrefStore::ApplyBackgroundModeSwitches() { if (command_line_->HasSwitch(switches::kDisableBackgroundMode) || command_line_->HasSwitch(switches::kDisableExtensions)) { - Value* value = Value::CreateBooleanValue(false); + base::Value* value = base::Value::CreateBooleanValue(false); SetValue(prefs::kBackgroundModeEnabled, value); } } diff --git a/chrome/browser/prefs/command_line_pref_store_unittest.cc b/chrome/browser/prefs/command_line_pref_store_unittest.cc index bf76bd3..cd5ad93 100644 --- a/chrome/browser/prefs/command_line_pref_store_unittest.cc +++ b/chrome/browser/prefs/command_line_pref_store_unittest.cc @@ -31,10 +31,11 @@ class TestCommandLinePrefStore : public CommandLinePrefStore { } void VerifyProxyMode(ProxyPrefs::ProxyMode expected_mode) { - const Value* value = NULL; + const base::Value* value = NULL; ASSERT_TRUE(GetValue(prefs::kProxy, &value)); - ASSERT_EQ(Value::TYPE_DICTIONARY, value->GetType()); - ProxyConfigDictionary dict(static_cast<const DictionaryValue*>(value)); + ASSERT_EQ(base::Value::TYPE_DICTIONARY, value->GetType()); + ProxyConfigDictionary dict( + static_cast<const base::DictionaryValue*>(value)); ProxyPrefs::ProxyMode actual_mode; ASSERT_TRUE(dict.GetMode(&actual_mode)); EXPECT_EQ(expected_mode, actual_mode); @@ -42,14 +43,15 @@ class TestCommandLinePrefStore : public CommandLinePrefStore { void VerifySSLCipherSuites(const char* const* ciphers, size_t cipher_count) { - const Value* value = NULL; + const base::Value* value = NULL; ASSERT_TRUE(GetValue(prefs::kCipherSuiteBlacklist, &value)); - ASSERT_EQ(Value::TYPE_LIST, value->GetType()); - const ListValue* list_value = static_cast<const ListValue*>(value); + ASSERT_EQ(base::Value::TYPE_LIST, value->GetType()); + const base::ListValue* list_value = + static_cast<const base::ListValue*>(value); ASSERT_EQ(cipher_count, list_value->GetSize()); std::string cipher_string; - for (ListValue::const_iterator it = list_value->begin(); + for (base::ListValue::const_iterator it = list_value->begin(); it != list_value->end(); ++it, ++ciphers) { ASSERT_TRUE((*it)->GetAsString(&cipher_string)); EXPECT_EQ(*ciphers, cipher_string); @@ -66,7 +68,7 @@ TEST(CommandLinePrefStoreTest, SimpleStringPref) { cl.AppendSwitchASCII(switches::kLang, "hi-MOM"); scoped_refptr<CommandLinePrefStore> store = new CommandLinePrefStore(&cl); - const Value* actual = NULL; + const base::Value* actual = NULL; EXPECT_TRUE(store->GetValue(prefs::kApplicationLocale, &actual)); std::string result; EXPECT_TRUE(actual->GetAsString(&result)); @@ -90,7 +92,7 @@ TEST(CommandLinePrefStoreTest, NoPrefs) { cl.AppendSwitchASCII(unknown_bool, "a value"); scoped_refptr<CommandLinePrefStore> store = new CommandLinePrefStore(&cl); - const Value* actual = NULL; + const base::Value* actual = NULL; EXPECT_FALSE(store->GetValue(unknown_bool, &actual)); EXPECT_FALSE(store->GetValue(unknown_string, &actual)); } @@ -105,16 +107,16 @@ TEST(CommandLinePrefStoreTest, MultipleSwitches) { scoped_refptr<TestCommandLinePrefStore> store = new TestCommandLinePrefStore(&cl); - const Value* actual = NULL; + const base::Value* actual = NULL; EXPECT_FALSE(store->GetValue(unknown_bool, &actual)); EXPECT_FALSE(store->GetValue(unknown_string, &actual)); store->VerifyProxyMode(ProxyPrefs::MODE_FIXED_SERVERS); - const Value* value = NULL; + const base::Value* value = NULL; ASSERT_TRUE(store->GetValue(prefs::kProxy, &value)); - ASSERT_EQ(Value::TYPE_DICTIONARY, value->GetType()); - ProxyConfigDictionary dict(static_cast<const DictionaryValue*>(value)); + ASSERT_EQ(base::Value::TYPE_DICTIONARY, value->GetType()); + ProxyConfigDictionary dict(static_cast<const base::DictionaryValue*>(value)); std::string string_result; diff --git a/chrome/browser/prefs/incognito_mode_prefs_unittest.cc b/chrome/browser/prefs/incognito_mode_prefs_unittest.cc index 598606e..ea15b95 100644 --- a/chrome/browser/prefs/incognito_mode_prefs_unittest.cc +++ b/chrome/browser/prefs/incognito_mode_prefs_unittest.cc @@ -38,17 +38,20 @@ TEST_F(IncognitoModePrefsTest, IntToAvailability) { TEST_F(IncognitoModePrefsTest, GetAvailability) { prefs_.SetUserPref(prefs::kIncognitoModeAvailability, - Value::CreateIntegerValue(IncognitoModePrefs::ENABLED)); + base::Value::CreateIntegerValue( + IncognitoModePrefs::ENABLED)); EXPECT_EQ(IncognitoModePrefs::ENABLED, IncognitoModePrefs::GetAvailability(&prefs_)); prefs_.SetUserPref(prefs::kIncognitoModeAvailability, - Value::CreateIntegerValue(IncognitoModePrefs::DISABLED)); + base::Value::CreateIntegerValue( + IncognitoModePrefs::DISABLED)); EXPECT_EQ(IncognitoModePrefs::DISABLED, IncognitoModePrefs::GetAvailability(&prefs_)); prefs_.SetUserPref(prefs::kIncognitoModeAvailability, - Value::CreateIntegerValue(IncognitoModePrefs::FORCED)); + base::Value::CreateIntegerValue( + IncognitoModePrefs::FORCED)); EXPECT_EQ(IncognitoModePrefs::FORCED, IncognitoModePrefs::GetAvailability(&prefs_)); } @@ -65,7 +68,7 @@ typedef IncognitoModePrefsTest IncognitoModePrefsDeathTest; #if GTEST_HAS_DEATH_TEST TEST_F(IncognitoModePrefsDeathTest, MAYBE_GetAvailabilityBadValue) { prefs_.SetUserPref(prefs::kIncognitoModeAvailability, - Value::CreateIntegerValue(-1)); + base::Value::CreateIntegerValue(-1)); #if defined(NDEBUG) && defined(DCHECK_ALWAYS_ON) EXPECT_DEATH({ IncognitoModePrefs::Availability availability = diff --git a/chrome/browser/prefs/pref_metrics_service.cc b/chrome/browser/prefs/pref_metrics_service.cc index f6c61b5..dfce44b 100644 --- a/chrome/browser/prefs/pref_metrics_service.cc +++ b/chrome/browser/prefs/pref_metrics_service.cc @@ -154,7 +154,8 @@ void PrefMetricsService::RecordLaunchPrefs() { UMA_HISTOGRAM_ENUMERATION("Settings.StartupPageLoadSettings", restore_on_startup, kSessionStartupPrefValueMax); if (restore_on_startup == SessionStartupPref::kPrefValueURLs) { - const ListValue* url_list = prefs_->GetList(prefs::kURLsToRestoreOnStartup); + const base::ListValue* url_list = + prefs_->GetList(prefs::kURLsToRestoreOnStartup); UMA_HISTOGRAM_CUSTOM_COUNTS("Settings.StartupPageLoadURLs", url_list->GetSize(), 1, 50, 20); // Similarly, check startup pages for known search engine TLD+1s. @@ -234,7 +235,7 @@ void PrefMetricsService::OnPrefChanged( }; void PrefMetricsService::LogBooleanPrefChange(const std::string& histogram_name, - const Value* value) { + const base::Value* value) { bool boolean_value = false; if (!value->GetAsBoolean(&boolean_value)) return; @@ -245,7 +246,7 @@ void PrefMetricsService::LogBooleanPrefChange(const std::string& histogram_name, void PrefMetricsService::LogIntegerPrefChange(int boundary_value, const std::string& histogram_name, - const Value* value) { + const base::Value* value) { int integer_value = 0; if (!value->GetAsInteger(&integer_value)) return; diff --git a/chrome/browser/prefs/pref_model_associator.cc b/chrome/browser/prefs/pref_model_associator.cc index 80f34ed..bcf87ea 100644 --- a/chrome/browser/prefs/pref_model_associator.cc +++ b/chrome/browser/prefs/pref_model_associator.cc @@ -101,7 +101,7 @@ void PrefModelAssociator::InitPrefAndAssociate( const std::string& pref_name, syncer::SyncChangeList* sync_changes, SyncDataMap* migrated_preference_list) { - const Value* user_pref_value = pref_service_->GetUserPrefValue( + const base::Value* user_pref_value = pref_service_->GetUserPrefValue( pref_name.c_str()); VLOG(1) << "Associating preference " << pref_name; @@ -112,7 +112,7 @@ void PrefModelAssociator::InitPrefAndAssociate( preference.name() == GetOldMigratedPreferenceName(pref_name.c_str()))); base::JSONReader reader; - scoped_ptr<Value> sync_value(reader.ReadToValue(preference.value())); + scoped_ptr<base::Value> sync_value(reader.ReadToValue(preference.value())); if (!sync_value.get()) { LOG(ERROR) << "Failed to deserialize preference value: " << reader.GetErrorMessage(); @@ -122,13 +122,13 @@ void PrefModelAssociator::InitPrefAndAssociate( if (user_pref_value) { DVLOG(1) << "Found user pref value for " << pref_name; // We have both server and local values. Merge them. - scoped_ptr<Value> new_value( + scoped_ptr<base::Value> new_value( MergePreference(pref_name, *user_pref_value, *sync_value)); // Update the local preference based on what we got from the // sync server. Note: this only updates the user value store, which is // ignored if the preference is policy controlled. - if (new_value->IsType(Value::TYPE_NULL)) { + if (new_value->IsType(base::Value::TYPE_NULL)) { LOG(WARNING) << "Sync has null value for pref " << pref_name.c_str(); pref_service_->ClearPref(pref_name.c_str()); } else if (!new_value->IsType(user_pref_value->GetType())) { @@ -185,7 +185,7 @@ void PrefModelAssociator::InitPrefAndAssociate( sync_data)); } } - } else if (!sync_value->IsType(Value::TYPE_NULL)) { + } else if (!sync_value->IsType(base::Value::TYPE_NULL)) { // Only a server value exists. Just set the local user value. pref_service_->Set(pref_name.c_str(), *sync_value); } else { @@ -311,31 +311,32 @@ void PrefModelAssociator::StopSyncing(syncer::ModelType type) { pref_service_->OnIsSyncingChanged(); } -scoped_ptr<Value> PrefModelAssociator::MergePreference( +scoped_ptr<base::Value> PrefModelAssociator::MergePreference( const std::string& name, - const Value& local_value, - const Value& server_value) { + const base::Value& local_value, + const base::Value& server_value) { // This function special cases preferences individually, so don't attempt // to merge for all migrated values. if (name == prefs::kURLsToRestoreOnStartup || name == prefs::kURLsToRestoreOnStartupOld) { - return scoped_ptr<Value>(MergeListValues(local_value, server_value)).Pass(); + return scoped_ptr<base::Value>( + MergeListValues(local_value, server_value)).Pass(); } if (name == prefs::kContentSettingsPatternPairs) { - return scoped_ptr<Value>( + return scoped_ptr<base::Value>( MergeDictionaryValues(local_value, server_value)).Pass(); } // If this is not a specially handled preference, server wins. - return scoped_ptr<Value>(server_value.DeepCopy()).Pass(); + return scoped_ptr<base::Value>(server_value.DeepCopy()).Pass(); } bool PrefModelAssociator::CreatePrefSyncData( const std::string& name, - const Value& value, + const base::Value& value, syncer::SyncData* sync_data) const { - if (value.IsType(Value::TYPE_NULL)) { + if (value.IsType(base::Value::TYPE_NULL)) { LOG(ERROR) << "Attempting to sync a null pref value for " << name; return false; } @@ -359,50 +360,53 @@ bool PrefModelAssociator::CreatePrefSyncData( return true; } -Value* PrefModelAssociator::MergeListValues(const Value& from_value, - const Value& to_value) { - if (from_value.GetType() == Value::TYPE_NULL) +base::Value* PrefModelAssociator::MergeListValues(const base::Value& from_value, + const base::Value& to_value) { + if (from_value.GetType() == base::Value::TYPE_NULL) return to_value.DeepCopy(); - if (to_value.GetType() == Value::TYPE_NULL) + if (to_value.GetType() == base::Value::TYPE_NULL) return from_value.DeepCopy(); - DCHECK(from_value.GetType() == Value::TYPE_LIST); - DCHECK(to_value.GetType() == Value::TYPE_LIST); - const ListValue& from_list_value = static_cast<const ListValue&>(from_value); - const ListValue& to_list_value = static_cast<const ListValue&>(to_value); - ListValue* result = to_list_value.DeepCopy(); + DCHECK(from_value.GetType() == base::Value::TYPE_LIST); + DCHECK(to_value.GetType() == base::Value::TYPE_LIST); + const base::ListValue& from_list_value = + static_cast<const base::ListValue&>(from_value); + const base::ListValue& to_list_value = + static_cast<const base::ListValue&>(to_value); + base::ListValue* result = to_list_value.DeepCopy(); - for (ListValue::const_iterator i = from_list_value.begin(); + for (base::ListValue::const_iterator i = from_list_value.begin(); i != from_list_value.end(); ++i) { - Value* value = (*i)->DeepCopy(); + base::Value* value = (*i)->DeepCopy(); result->AppendIfNotPresent(value); } return result; } -Value* PrefModelAssociator::MergeDictionaryValues( - const Value& from_value, - const Value& to_value) { - if (from_value.GetType() == Value::TYPE_NULL) +base::Value* PrefModelAssociator::MergeDictionaryValues( + const base::Value& from_value, + const base::Value& to_value) { + if (from_value.GetType() == base::Value::TYPE_NULL) return to_value.DeepCopy(); - if (to_value.GetType() == Value::TYPE_NULL) + if (to_value.GetType() == base::Value::TYPE_NULL) return from_value.DeepCopy(); - DCHECK_EQ(from_value.GetType(), Value::TYPE_DICTIONARY); - DCHECK_EQ(to_value.GetType(), Value::TYPE_DICTIONARY); - const DictionaryValue& from_dict_value = - static_cast<const DictionaryValue&>(from_value); - const DictionaryValue& to_dict_value = - static_cast<const DictionaryValue&>(to_value); - DictionaryValue* result = to_dict_value.DeepCopy(); + DCHECK_EQ(from_value.GetType(), base::Value::TYPE_DICTIONARY); + DCHECK_EQ(to_value.GetType(), base::Value::TYPE_DICTIONARY); + const base::DictionaryValue& from_dict_value = + static_cast<const base::DictionaryValue&>(from_value); + const base::DictionaryValue& to_dict_value = + static_cast<const base::DictionaryValue&>(to_value); + base::DictionaryValue* result = to_dict_value.DeepCopy(); - for (DictionaryValue::Iterator it(from_dict_value); !it.IsAtEnd(); + for (base::DictionaryValue::Iterator it(from_dict_value); !it.IsAtEnd(); it.Advance()) { - const Value* from_value = &it.value(); - Value* to_key_value; + const base::Value* from_value = &it.value(); + base::Value* to_key_value; if (result->GetWithoutPathExpansion(it.key(), &to_key_value)) { - if (to_key_value->GetType() == Value::TYPE_DICTIONARY) { - Value* merged_value = MergeDictionaryValues(*from_value, *to_key_value); + if (to_key_value->GetType() == base::Value::TYPE_DICTIONARY) { + base::Value* merged_value = + MergeDictionaryValues(*from_value, *to_key_value); result->SetWithoutPathExpansion(it.key(), merged_value); } // Note that for all other types we want to preserve the "to" @@ -471,8 +475,8 @@ syncer::SyncError PrefModelAssociator::ProcessSyncChanges( const sync_pb::PreferenceSpecifics& pref_specifics = GetSpecifics(iter->sync_data()); - scoped_ptr<Value> value(ReadPreferenceSpecifics(pref_specifics, - &name)); + scoped_ptr<base::Value> value(ReadPreferenceSpecifics(pref_specifics, + &name)); if (iter->change_type() == syncer::SyncChange::ACTION_DELETE) { // We never delete preferences. @@ -521,11 +525,11 @@ syncer::SyncError PrefModelAssociator::ProcessSyncChanges( return syncer::SyncError(); } -Value* PrefModelAssociator::ReadPreferenceSpecifics( +base::Value* PrefModelAssociator::ReadPreferenceSpecifics( const sync_pb::PreferenceSpecifics& preference, std::string* name) { base::JSONReader reader; - scoped_ptr<Value> value(reader.ReadToValue(preference.value())); + scoped_ptr<base::Value> value(reader.ReadToValue(preference.value())); if (!value.get()) { std::string err = "Failed to deserialize preference value: " + reader.GetErrorMessage(); diff --git a/chrome/browser/prefs/pref_model_associator_unittest.cc b/chrome/browser/prefs/pref_model_associator_unittest.cc index 08884c7..0c9d45b 100644 --- a/chrome/browser/prefs/pref_model_associator_unittest.cc +++ b/chrome/browser/prefs/pref_model_associator_unittest.cc @@ -16,33 +16,33 @@ class AbstractPreferenceMergeTest : public testing::Test { pref_service_ = profile_.GetPrefs(); } - void SetContentPattern(DictionaryValue* patterns_dict, + void SetContentPattern(base::DictionaryValue* patterns_dict, const std::string& expression, const std::string& content_type, int setting) { - DictionaryValue* expression_dict; + base::DictionaryValue* expression_dict; bool found = patterns_dict->GetDictionaryWithoutPathExpansion(expression, &expression_dict); if (!found) { - expression_dict = new DictionaryValue; + expression_dict = new base::DictionaryValue; patterns_dict->SetWithoutPathExpansion(expression, expression_dict); } expression_dict->SetWithoutPathExpansion( content_type, - Value::CreateIntegerValue(setting)); + base::Value::CreateIntegerValue(setting)); } void SetPrefToEmpty(const std::string& pref_name) { - scoped_ptr<Value> empty_value; + scoped_ptr<base::Value> empty_value; const PrefService::Preference* pref = pref_service_->FindPreference(pref_name.c_str()); ASSERT_TRUE(pref); base::Value::Type type = pref->GetType(); - if (type == Value::TYPE_DICTIONARY) - empty_value.reset(new DictionaryValue); - else if (type == Value::TYPE_LIST) - empty_value.reset(new ListValue); + if (type == base::Value::TYPE_DICTIONARY) + empty_value.reset(new base::DictionaryValue); + else if (type == base::Value::TYPE_LIST) + empty_value.reset(new base::ListValue); else FAIL(); pref_service_->Set(pref_name.c_str(), *empty_value); @@ -62,23 +62,24 @@ class ListPreferenceMergeTest : public AbstractPreferenceMergeTest { virtual void SetUp() { AbstractPreferenceMergeTest::SetUp(); - server_url_list_.Append(Value::CreateStringValue(server_url0_)); - server_url_list_.Append(Value::CreateStringValue(server_url1_)); + server_url_list_.Append(base::Value::CreateStringValue(server_url0_)); + server_url_list_.Append(base::Value::CreateStringValue(server_url1_)); } std::string server_url0_; std::string server_url1_; std::string local_url0_; std::string local_url1_; - ListValue server_url_list_; + base::ListValue server_url_list_; }; TEST_F(ListPreferenceMergeTest, NotListOrDictionary) { pref_service_->SetString(prefs::kHomePage, local_url0_); const PrefService::Preference* pref = pref_service_->FindPreference(prefs::kHomePage); - scoped_ptr<Value> server_value(Value::CreateStringValue(server_url0_)); - scoped_ptr<Value> merged_value( + scoped_ptr<base::Value> server_value( + base::Value::CreateStringValue(server_url0_)); + scoped_ptr<base::Value> merged_value( PrefModelAssociator::MergePreference(pref->name(), *pref->GetValue(), *server_value)); @@ -89,7 +90,7 @@ TEST_F(ListPreferenceMergeTest, LocalEmpty) { SetPrefToEmpty(prefs::kURLsToRestoreOnStartup); const PrefService::Preference* pref = pref_service_->FindPreference(prefs::kURLsToRestoreOnStartup); - scoped_ptr<Value> merged_value( + scoped_ptr<base::Value> merged_value( PrefModelAssociator::MergePreference(pref->name(), *pref->GetValue(), server_url_list_)); @@ -97,39 +98,39 @@ TEST_F(ListPreferenceMergeTest, LocalEmpty) { } TEST_F(ListPreferenceMergeTest, ServerNull) { - scoped_ptr<Value> null_value(Value::CreateNullValue()); + scoped_ptr<base::Value> null_value(base::Value::CreateNullValue()); { ListPrefUpdate update(pref_service_, prefs::kURLsToRestoreOnStartup); - ListValue* local_list_value = update.Get(); - local_list_value->Append(Value::CreateStringValue(local_url0_)); + base::ListValue* local_list_value = update.Get(); + local_list_value->Append(base::Value::CreateStringValue(local_url0_)); } const PrefService::Preference* pref = pref_service_->FindPreference(prefs::kURLsToRestoreOnStartup); - scoped_ptr<Value> merged_value( + scoped_ptr<base::Value> merged_value( PrefModelAssociator::MergePreference(pref->name(), *pref->GetValue(), *null_value)); - const ListValue* local_list_value = + const base::ListValue* local_list_value = pref_service_->GetList(prefs::kURLsToRestoreOnStartup); EXPECT_TRUE(merged_value->Equals(local_list_value)); } TEST_F(ListPreferenceMergeTest, ServerEmpty) { - scoped_ptr<Value> empty_value(new ListValue); + scoped_ptr<base::Value> empty_value(new base::ListValue); { ListPrefUpdate update(pref_service_, prefs::kURLsToRestoreOnStartup); - ListValue* local_list_value = update.Get(); - local_list_value->Append(Value::CreateStringValue(local_url0_)); + base::ListValue* local_list_value = update.Get(); + local_list_value->Append(base::Value::CreateStringValue(local_url0_)); } const PrefService::Preference* pref = pref_service_->FindPreference(prefs::kURLsToRestoreOnStartup); - scoped_ptr<Value> merged_value( + scoped_ptr<base::Value> merged_value( PrefModelAssociator::MergePreference(pref->name(), *pref->GetValue(), *empty_value)); - const ListValue* local_list_value = + const base::ListValue* local_list_value = pref_service_->GetList(prefs::kURLsToRestoreOnStartup); EXPECT_TRUE(merged_value->Equals(local_list_value)); } @@ -137,61 +138,61 @@ TEST_F(ListPreferenceMergeTest, ServerEmpty) { TEST_F(ListPreferenceMergeTest, Merge) { { ListPrefUpdate update(pref_service_, prefs::kURLsToRestoreOnStartup); - ListValue* local_list_value = update.Get(); - local_list_value->Append(Value::CreateStringValue(local_url0_)); - local_list_value->Append(Value::CreateStringValue(local_url1_)); + base::ListValue* local_list_value = update.Get(); + local_list_value->Append(base::Value::CreateStringValue(local_url0_)); + local_list_value->Append(base::Value::CreateStringValue(local_url1_)); } const PrefService::Preference* pref = pref_service_->FindPreference(prefs::kURLsToRestoreOnStartup); - scoped_ptr<Value> merged_value( + scoped_ptr<base::Value> merged_value( PrefModelAssociator::MergePreference(pref->name(), *pref->GetValue(), server_url_list_)); - ListValue expected; - expected.Append(Value::CreateStringValue(server_url0_)); - expected.Append(Value::CreateStringValue(server_url1_)); - expected.Append(Value::CreateStringValue(local_url0_)); - expected.Append(Value::CreateStringValue(local_url1_)); + base::ListValue expected; + expected.Append(base::Value::CreateStringValue(server_url0_)); + expected.Append(base::Value::CreateStringValue(server_url1_)); + expected.Append(base::Value::CreateStringValue(local_url0_)); + expected.Append(base::Value::CreateStringValue(local_url1_)); EXPECT_TRUE(merged_value->Equals(&expected)); } TEST_F(ListPreferenceMergeTest, Duplicates) { { ListPrefUpdate update(pref_service_, prefs::kURLsToRestoreOnStartup); - ListValue* local_list_value = update.Get(); - local_list_value->Append(Value::CreateStringValue(local_url0_)); - local_list_value->Append(Value::CreateStringValue(server_url0_)); - local_list_value->Append(Value::CreateStringValue(server_url1_)); + base::ListValue* local_list_value = update.Get(); + local_list_value->Append(base::Value::CreateStringValue(local_url0_)); + local_list_value->Append(base::Value::CreateStringValue(server_url0_)); + local_list_value->Append(base::Value::CreateStringValue(server_url1_)); } const PrefService::Preference* pref = pref_service_->FindPreference(prefs::kURLsToRestoreOnStartup); - scoped_ptr<Value> merged_value( + scoped_ptr<base::Value> merged_value( PrefModelAssociator::MergePreference(pref->name(), *pref->GetValue(), server_url_list_)); - ListValue expected; - expected.Append(Value::CreateStringValue(server_url0_)); - expected.Append(Value::CreateStringValue(server_url1_)); - expected.Append(Value::CreateStringValue(local_url0_)); + base::ListValue expected; + expected.Append(base::Value::CreateStringValue(server_url0_)); + expected.Append(base::Value::CreateStringValue(server_url1_)); + expected.Append(base::Value::CreateStringValue(local_url0_)); EXPECT_TRUE(merged_value->Equals(&expected)); } TEST_F(ListPreferenceMergeTest, Equals) { { ListPrefUpdate update(pref_service_, prefs::kURLsToRestoreOnStartup); - ListValue* local_list_value = update.Get(); - local_list_value->Append(Value::CreateStringValue(server_url0_)); - local_list_value->Append(Value::CreateStringValue(server_url1_)); + base::ListValue* local_list_value = update.Get(); + local_list_value->Append(base::Value::CreateStringValue(server_url0_)); + local_list_value->Append(base::Value::CreateStringValue(server_url1_)); } - scoped_ptr<Value> original(server_url_list_.DeepCopy()); + scoped_ptr<base::Value> original(server_url_list_.DeepCopy()); const PrefService::Preference* pref = pref_service_->FindPreference(prefs::kURLsToRestoreOnStartup); - scoped_ptr<Value> merged_value( + scoped_ptr<base::Value> merged_value( PrefModelAssociator::MergePreference(pref->name(), *pref->GetValue(), server_url_list_)); @@ -219,14 +220,14 @@ class DictionaryPreferenceMergeTest : public AbstractPreferenceMergeTest { std::string expression2_; std::string content_type0_; std::string content_type1_; - DictionaryValue server_patterns_; + base::DictionaryValue server_patterns_; }; TEST_F(DictionaryPreferenceMergeTest, LocalEmpty) { SetPrefToEmpty(prefs::kContentSettingsPatternPairs); const PrefService::Preference* pref = pref_service_->FindPreference(prefs::kContentSettingsPatternPairs); - scoped_ptr<Value> merged_value( + scoped_ptr<base::Value> merged_value( PrefModelAssociator::MergePreference(pref->name(), *pref->GetValue(), server_patterns_)); @@ -234,41 +235,41 @@ TEST_F(DictionaryPreferenceMergeTest, LocalEmpty) { } TEST_F(DictionaryPreferenceMergeTest, ServerNull) { - scoped_ptr<Value> null_value(Value::CreateNullValue()); + scoped_ptr<base::Value> null_value(base::Value::CreateNullValue()); { DictionaryPrefUpdate update(pref_service_, prefs::kContentSettingsPatternPairs); - DictionaryValue* local_dict_value = update.Get(); + base::DictionaryValue* local_dict_value = update.Get(); SetContentPattern(local_dict_value, expression2_, content_type0_, 1); } const PrefService::Preference* pref = pref_service_->FindPreference(prefs::kContentSettingsPatternPairs); - scoped_ptr<Value> merged_value( + scoped_ptr<base::Value> merged_value( PrefModelAssociator::MergePreference(pref->name(), *pref->GetValue(), *null_value)); - const DictionaryValue* local_dict_value = + const base::DictionaryValue* local_dict_value = pref_service_->GetDictionary(prefs::kContentSettingsPatternPairs); EXPECT_TRUE(merged_value->Equals(local_dict_value)); } TEST_F(DictionaryPreferenceMergeTest, ServerEmpty) { - scoped_ptr<Value> empty_value(new DictionaryValue); + scoped_ptr<base::Value> empty_value(new base::DictionaryValue); { DictionaryPrefUpdate update(pref_service_, prefs::kContentSettingsPatternPairs); - DictionaryValue* local_dict_value = update.Get(); + base::DictionaryValue* local_dict_value = update.Get(); SetContentPattern(local_dict_value, expression2_, content_type0_, 1); } const PrefService::Preference* pref = pref_service_->FindPreference(prefs::kContentSettingsPatternPairs); - scoped_ptr<Value> merged_value( + scoped_ptr<base::Value> merged_value( PrefModelAssociator::MergePreference(pref->name(), *pref->GetValue(), *empty_value)); - const DictionaryValue* local_dict_value = + const base::DictionaryValue* local_dict_value = pref_service_->GetDictionary(prefs::kContentSettingsPatternPairs); EXPECT_TRUE(merged_value->Equals(local_dict_value)); } @@ -277,17 +278,17 @@ TEST_F(DictionaryPreferenceMergeTest, MergeNoConflicts) { { DictionaryPrefUpdate update(pref_service_, prefs::kContentSettingsPatternPairs); - DictionaryValue* local_dict_value = update.Get(); + base::DictionaryValue* local_dict_value = update.Get(); SetContentPattern(local_dict_value, expression2_, content_type0_, 1); } - scoped_ptr<Value> merged_value(PrefModelAssociator::MergePreference( + scoped_ptr<base::Value> merged_value(PrefModelAssociator::MergePreference( prefs::kContentSettingsPatternPairs, *pref_service_->FindPreference(prefs::kContentSettingsPatternPairs)-> GetValue(), server_patterns_)); - DictionaryValue expected; + base::DictionaryValue expected; SetContentPattern(&expected, expression0_, content_type0_, 1); SetContentPattern(&expected, expression0_, content_type1_, 2); SetContentPattern(&expected, expression1_, content_type0_, 1); @@ -299,20 +300,20 @@ TEST_F(DictionaryPreferenceMergeTest, MergeConflicts) { { DictionaryPrefUpdate update(pref_service_, prefs::kContentSettingsPatternPairs); - DictionaryValue* local_dict_value = update.Get(); + base::DictionaryValue* local_dict_value = update.Get(); SetContentPattern(local_dict_value, expression0_, content_type0_, 2); SetContentPattern(local_dict_value, expression1_, content_type0_, 1); SetContentPattern(local_dict_value, expression1_, content_type1_, 1); SetContentPattern(local_dict_value, expression2_, content_type0_, 2); } - scoped_ptr<Value> merged_value(PrefModelAssociator::MergePreference( + scoped_ptr<base::Value> merged_value(PrefModelAssociator::MergePreference( prefs::kContentSettingsPatternPairs, *pref_service_->FindPreference(prefs::kContentSettingsPatternPairs)-> GetValue(), server_patterns_)); - DictionaryValue expected; + base::DictionaryValue expected; SetContentPattern(&expected, expression0_, content_type0_, 1); SetContentPattern(&expected, expression0_, content_type1_, 2); SetContentPattern(&expected, expression1_, content_type0_, 1); @@ -325,13 +326,13 @@ TEST_F(DictionaryPreferenceMergeTest, Equal) { { DictionaryPrefUpdate update(pref_service_, prefs::kContentSettingsPatternPairs); - DictionaryValue* local_dict_value = update.Get(); + base::DictionaryValue* local_dict_value = update.Get(); SetContentPattern(local_dict_value, expression0_, content_type0_, 1); SetContentPattern(local_dict_value, expression0_, content_type1_, 2); SetContentPattern(local_dict_value, expression1_, content_type0_, 1); } - scoped_ptr<Value> merged_value(PrefModelAssociator::MergePreference( + scoped_ptr<base::Value> merged_value(PrefModelAssociator::MergePreference( prefs::kContentSettingsPatternPairs, *pref_service_-> FindPreference(prefs::kContentSettingsPatternPairs)->GetValue(), @@ -343,13 +344,13 @@ TEST_F(DictionaryPreferenceMergeTest, ConflictButServerWins) { { DictionaryPrefUpdate update(pref_service_, prefs::kContentSettingsPatternPairs); - DictionaryValue* local_dict_value = update.Get(); + base::DictionaryValue* local_dict_value = update.Get(); SetContentPattern(local_dict_value, expression0_, content_type0_, 2); SetContentPattern(local_dict_value, expression0_, content_type1_, 2); SetContentPattern(local_dict_value, expression1_, content_type0_, 1); } - scoped_ptr<Value> merged_value(PrefModelAssociator::MergePreference( + scoped_ptr<base::Value> merged_value(PrefModelAssociator::MergePreference( prefs::kContentSettingsPatternPairs, *pref_service_-> FindPreference(prefs::kContentSettingsPatternPairs)->GetValue(), @@ -368,41 +369,41 @@ class IndividualPreferenceMergeTest : public AbstractPreferenceMergeTest { virtual void SetUp() { AbstractPreferenceMergeTest::SetUp(); - server_url_list_.Append(Value::CreateStringValue(url0_)); + server_url_list_.Append(base::Value::CreateStringValue(url0_)); SetContentPattern(&server_patterns_, expression0_, content_type0_, 1); } bool MergeListPreference(const char* pref) { { ListPrefUpdate update(pref_service_, pref); - ListValue* local_list_value = update.Get(); - local_list_value->Append(Value::CreateStringValue(url1_)); + base::ListValue* local_list_value = update.Get(); + local_list_value->Append(base::Value::CreateStringValue(url1_)); } - scoped_ptr<Value> merged_value(PrefModelAssociator::MergePreference( + scoped_ptr<base::Value> merged_value(PrefModelAssociator::MergePreference( pref, *pref_service_->GetUserPrefValue(pref), server_url_list_)); - ListValue expected; - expected.Append(Value::CreateStringValue(url0_)); - expected.Append(Value::CreateStringValue(url1_)); + base::ListValue expected; + expected.Append(base::Value::CreateStringValue(url0_)); + expected.Append(base::Value::CreateStringValue(url1_)); return merged_value->Equals(&expected); } bool MergeDictionaryPreference(const char* pref) { { DictionaryPrefUpdate update(pref_service_, pref); - DictionaryValue* local_dict_value = update.Get(); + base::DictionaryValue* local_dict_value = update.Get(); SetContentPattern(local_dict_value, expression1_, content_type0_, 1); } - scoped_ptr<Value> merged_value(PrefModelAssociator::MergePreference( + scoped_ptr<base::Value> merged_value(PrefModelAssociator::MergePreference( pref, *pref_service_->GetUserPrefValue(pref), server_patterns_)); - DictionaryValue expected; + base::DictionaryValue expected; SetContentPattern(&expected, expression0_, content_type0_, 1); SetContentPattern(&expected, expression1_, content_type0_, 1); return merged_value->Equals(&expected); @@ -413,8 +414,8 @@ class IndividualPreferenceMergeTest : public AbstractPreferenceMergeTest { std::string expression0_; std::string expression1_; std::string content_type0_; - ListValue server_url_list_; - DictionaryValue server_patterns_; + base::ListValue server_url_list_; + base::DictionaryValue server_patterns_; }; TEST_F(IndividualPreferenceMergeTest, URLsToRestoreOnStartup) { diff --git a/chrome/browser/prefs/pref_service_browsertest.cc b/chrome/browser/prefs/pref_service_browsertest.cc index 959e162..f524981 100644 --- a/chrome/browser/prefs/pref_service_browsertest.cc +++ b/chrome/browser/prefs/pref_service_browsertest.cc @@ -128,12 +128,13 @@ IN_PROC_BROWSER_TEST_F(PreservedWindowPlacementIsLoaded, Test) { // The window should open with the new reference profile, with window // placement values stored in the user data directory. JSONFileValueSerializer deserializer(tmp_pref_file_); - scoped_ptr<Value> root(deserializer.Deserialize(NULL, NULL)); + scoped_ptr<base::Value> root(deserializer.Deserialize(NULL, NULL)); ASSERT_TRUE(root.get()); - ASSERT_TRUE(root->IsType(Value::TYPE_DICTIONARY)); + ASSERT_TRUE(root->IsType(base::Value::TYPE_DICTIONARY)); - DictionaryValue* root_dict = static_cast<DictionaryValue*>(root.get()); + base::DictionaryValue* root_dict = + static_cast<base::DictionaryValue*>(root.get()); // Retrieve the screen rect for the launched window gfx::Rect bounds = browser()->window()->GetRestoredBounds(); @@ -188,10 +189,10 @@ IN_PROC_BROWSER_TEST_F(PreservedWindowPlacementIsMigrated, Test) { // placement values stored in Local State. JSONFileValueSerializer deserializer(tmp_pref_file_); - scoped_ptr<Value> root(deserializer.Deserialize(NULL, NULL)); + scoped_ptr<base::Value> root(deserializer.Deserialize(NULL, NULL)); ASSERT_TRUE(root.get()); - ASSERT_TRUE(root->IsType(Value::TYPE_DICTIONARY)); + ASSERT_TRUE(root->IsType(base::Value::TYPE_DICTIONARY)); // Retrieve the screen rect for the launched window gfx::Rect bounds = browser()->window()->GetRestoredBounds(); @@ -199,7 +200,8 @@ IN_PROC_BROWSER_TEST_F(PreservedWindowPlacementIsMigrated, Test) { // Values from old reference profile in Local State should have been // correctly migrated to the user's Preferences -- if so, the window // should be set to values taken from the user's Local State. - DictionaryValue* root_dict = static_cast<DictionaryValue*>(root.get()); + base::DictionaryValue* root_dict = + static_cast<base::DictionaryValue*>(root.get()); // Retrieve the expected rect values from User Preferences, where they // should have been migrated from Local State. diff --git a/chrome/browser/prefs/proxy_config_dictionary.cc b/chrome/browser/prefs/proxy_config_dictionary.cc index e2d9d4b..85852ea 100644 --- a/chrome/browser/prefs/proxy_config_dictionary.cc +++ b/chrome/browser/prefs/proxy_config_dictionary.cc @@ -29,7 +29,7 @@ const char kProxyBypassList[] = "bypass_list"; } // namespace -ProxyConfigDictionary::ProxyConfigDictionary(const DictionaryValue* dict) +ProxyConfigDictionary::ProxyConfigDictionary(const base::DictionaryValue* dict) : dict_(dict->DeepCopy()) { } @@ -65,12 +65,12 @@ bool ProxyConfigDictionary::HasBypassList() const { return dict_->HasKey(kProxyBypassList); } -const DictionaryValue& ProxyConfigDictionary::GetDictionary() const { +const base::DictionaryValue& ProxyConfigDictionary::GetDictionary() const { return *dict_; } // static -DictionaryValue* ProxyConfigDictionary::CreateDirect() { +base::DictionaryValue* ProxyConfigDictionary::CreateDirect() { return CreateDictionary(ProxyPrefs::MODE_DIRECT, std::string(), false, @@ -79,7 +79,7 @@ DictionaryValue* ProxyConfigDictionary::CreateDirect() { } // static -DictionaryValue* ProxyConfigDictionary::CreateAutoDetect() { +base::DictionaryValue* ProxyConfigDictionary::CreateAutoDetect() { return CreateDictionary(ProxyPrefs::MODE_AUTO_DETECT, std::string(), false, @@ -88,7 +88,7 @@ DictionaryValue* ProxyConfigDictionary::CreateAutoDetect() { } // static -DictionaryValue* ProxyConfigDictionary::CreatePacScript( +base::DictionaryValue* ProxyConfigDictionary::CreatePacScript( const std::string& pac_url, bool pac_mandatory) { return CreateDictionary(ProxyPrefs::MODE_PAC_SCRIPT, @@ -99,7 +99,7 @@ DictionaryValue* ProxyConfigDictionary::CreatePacScript( } // static -DictionaryValue* ProxyConfigDictionary::CreateFixedServers( +base::DictionaryValue* ProxyConfigDictionary::CreateFixedServers( const std::string& proxy_server, const std::string& bypass_list) { if (!proxy_server.empty()) { @@ -114,7 +114,7 @@ DictionaryValue* ProxyConfigDictionary::CreateFixedServers( } // static -DictionaryValue* ProxyConfigDictionary::CreateSystem() { +base::DictionaryValue* ProxyConfigDictionary::CreateSystem() { return CreateDictionary(ProxyPrefs::MODE_SYSTEM, std::string(), false, @@ -123,13 +123,13 @@ DictionaryValue* ProxyConfigDictionary::CreateSystem() { } // static -DictionaryValue* ProxyConfigDictionary::CreateDictionary( +base::DictionaryValue* ProxyConfigDictionary::CreateDictionary( ProxyPrefs::ProxyMode mode, const std::string& pac_url, bool pac_mandatory, const std::string& proxy_server, const std::string& bypass_list) { - DictionaryValue* dict = new DictionaryValue(); + base::DictionaryValue* dict = new base::DictionaryValue(); dict->SetString(kProxyMode, ProxyModeToString(mode)); if (!pac_url.empty()) { dict->SetString(kProxyPacUrl, pac_url); diff --git a/chrome/browser/prefs/proxy_config_dictionary_unittest.cc b/chrome/browser/prefs/proxy_config_dictionary_unittest.cc index 8301266..171c34b 100644 --- a/chrome/browser/prefs/proxy_config_dictionary_unittest.cc +++ b/chrome/browser/prefs/proxy_config_dictionary_unittest.cc @@ -17,7 +17,8 @@ struct ProxyConfigHolder { }; TEST(ProxyConfigDictionaryTest, CreateDirect) { - scoped_ptr<DictionaryValue> dict_value(ProxyConfigDictionary::CreateDirect()); + scoped_ptr<base::DictionaryValue> dict_value( + ProxyConfigDictionary::CreateDirect()); ProxyConfigDictionary dict(dict_value.get()); ProxyConfigHolder h; @@ -29,7 +30,7 @@ TEST(ProxyConfigDictionaryTest, CreateDirect) { } TEST(ProxyConfigDictionaryTest, CreateAutoDetect) { - scoped_ptr<DictionaryValue> dict_value( + scoped_ptr<base::DictionaryValue> dict_value( ProxyConfigDictionary::CreateAutoDetect()); ProxyConfigDictionary dict(dict_value.get()); ProxyConfigHolder h; @@ -42,7 +43,7 @@ TEST(ProxyConfigDictionaryTest, CreateAutoDetect) { } TEST(ProxyConfigDictionaryTest, CreatePacScript) { - scoped_ptr<DictionaryValue> dict_value( + scoped_ptr<base::DictionaryValue> dict_value( ProxyConfigDictionary::CreatePacScript("pac", false)); ProxyConfigDictionary dict(dict_value.get()); ProxyConfigHolder h; @@ -56,7 +57,7 @@ TEST(ProxyConfigDictionaryTest, CreatePacScript) { } TEST(ProxyConfigDictionaryTest, CreateFixedServers) { - scoped_ptr<DictionaryValue> dict_value( + scoped_ptr<base::DictionaryValue> dict_value( ProxyConfigDictionary::CreateFixedServers("http://1.2.3.4", "http://foo")); ProxyConfigDictionary dict(dict_value.get()); @@ -72,7 +73,8 @@ TEST(ProxyConfigDictionaryTest, CreateFixedServers) { } TEST(ProxyConfigDictionaryTest, CreateSystem) { - scoped_ptr<DictionaryValue> dict_value(ProxyConfigDictionary::CreateSystem()); + scoped_ptr<base::DictionaryValue> dict_value( + ProxyConfigDictionary::CreateSystem()); ProxyConfigDictionary dict(dict_value.get()); ProxyConfigHolder h; diff --git a/chrome/browser/prefs/proxy_policy_unittest.cc b/chrome/browser/prefs/proxy_policy_unittest.cc index 07c645a..a1c9046 100644 --- a/chrome/browser/prefs/proxy_policy_unittest.cc +++ b/chrome/browser/prefs/proxy_policy_unittest.cc @@ -120,15 +120,15 @@ class ProxyPolicyTest : public testing::Test { TEST_F(ProxyPolicyTest, OverridesCommandLineOptions) { command_line_.AppendSwitchASCII(switches::kProxyBypassList, "123"); command_line_.AppendSwitchASCII(switches::kProxyServer, "789"); - Value* mode_name = Value::CreateStringValue( + base::Value* mode_name = base::Value::CreateStringValue( ProxyPrefs::kFixedServersProxyModeName); PolicyMap policy; policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, mode_name, NULL); policy.Set(key::kProxyBypassList, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - Value::CreateStringValue("abc"), NULL); + base::Value::CreateStringValue("abc"), NULL); policy.Set(key::kProxyServer, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - Value::CreateStringValue("ghi"), NULL); + base::Value::CreateStringValue("ghi"), NULL); provider_.UpdateChromePolicy(policy); // First verify that command-line options are set correctly when @@ -154,7 +154,7 @@ TEST_F(ProxyPolicyTest, OverridesCommandLineOptions) { TEST_F(ProxyPolicyTest, OverridesUnrelatedCommandLineOptions) { command_line_.AppendSwitchASCII(switches::kProxyBypassList, "123"); command_line_.AppendSwitchASCII(switches::kProxyServer, "789"); - Value* mode_name = Value::CreateStringValue( + base::Value* mode_name = base::Value::CreateStringValue( ProxyPrefs::kAutoDetectProxyModeName); PolicyMap policy; policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, @@ -181,7 +181,7 @@ TEST_F(ProxyPolicyTest, OverridesUnrelatedCommandLineOptions) { TEST_F(ProxyPolicyTest, OverridesCommandLineNoProxy) { command_line_.AppendSwitch(switches::kNoProxyServer); - Value* mode_name = Value::CreateStringValue( + base::Value* mode_name = base::Value::CreateStringValue( ProxyPrefs::kAutoDetectProxyModeName); PolicyMap policy; policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, @@ -204,7 +204,7 @@ TEST_F(ProxyPolicyTest, OverridesCommandLineNoProxy) { TEST_F(ProxyPolicyTest, OverridesCommandLineAutoDetect) { command_line_.AppendSwitch(switches::kProxyAutoDetect); - Value* mode_name = Value::CreateStringValue( + base::Value* mode_name = base::Value::CreateStringValue( ProxyPrefs::kDirectProxyModeName); PolicyMap policy; policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, diff --git a/chrome/browser/prefs/session_startup_pref.cc b/chrome/browser/prefs/session_startup_pref.cc index 7534e7d..69bd418 100644 --- a/chrome/browser/prefs/session_startup_pref.cc +++ b/chrome/browser/prefs/session_startup_pref.cc @@ -113,12 +113,12 @@ void SessionStartupPref::SetStartupPref(PrefService* prefs, // user changes the startup type pref. // Ownership of the ListValue retains with the pref service. ListPrefUpdate update(prefs, prefs::kURLsToRestoreOnStartup); - ListValue* url_pref_list = update.Get(); + base::ListValue* url_pref_list = update.Get(); DCHECK(url_pref_list); url_pref_list->Clear(); for (size_t i = 0; i < pref.urls.size(); ++i) { url_pref_list->Set(static_cast<int>(i), - new StringValue(pref.urls[i].spec())); + new base::StringValue(pref.urls[i].spec())); } } } @@ -141,7 +141,8 @@ SessionStartupPref SessionStartupPref::GetStartupPref(PrefService* prefs) { // Always load the urls, even if the pref type isn't URLS. This way the // preferences panels can show the user their last choice. - const ListValue* url_list = prefs->GetList(prefs::kURLsToRestoreOnStartup); + const base::ListValue* url_list = + prefs->GetList(prefs::kURLsToRestoreOnStartup); URLListToPref(url_list, &pref); return pref; diff --git a/chrome/browser/prefs/session_startup_pref_unittest.cc b/chrome/browser/prefs/session_startup_pref_unittest.cc index 9279bf0..7239de0 100644 --- a/chrome/browser/prefs/session_startup_pref_unittest.cc +++ b/chrome/browser/prefs/session_startup_pref_unittest.cc @@ -48,9 +48,9 @@ class SessionStartupPrefTest : public testing::Test { }; TEST_F(SessionStartupPrefTest, URLListIsFixedUp) { - ListValue* url_pref_list = new ListValue; - url_pref_list->Set(0, Value::CreateStringValue("google.com")); - url_pref_list->Set(1, Value::CreateStringValue("chromium.org")); + base::ListValue* url_pref_list = new base::ListValue; + url_pref_list->Set(0, base::Value::CreateStringValue("google.com")); + url_pref_list->Set(1, base::Value::CreateStringValue("chromium.org")); pref_service_->SetUserPref(prefs::kURLsToRestoreOnStartup, url_pref_list); SessionStartupPref result = @@ -61,14 +61,14 @@ TEST_F(SessionStartupPrefTest, URLListIsFixedUp) { } TEST_F(SessionStartupPrefTest, URLListManagedOverridesUser) { - ListValue* url_pref_list1 = new ListValue; - url_pref_list1->Set(0, Value::CreateStringValue("chromium.org")); + base::ListValue* url_pref_list1 = new base::ListValue; + url_pref_list1->Set(0, base::Value::CreateStringValue("chromium.org")); pref_service_->SetUserPref(prefs::kURLsToRestoreOnStartup, url_pref_list1); - ListValue* url_pref_list2 = new ListValue; - url_pref_list2->Set(0, Value::CreateStringValue("chromium.org")); - url_pref_list2->Set(1, Value::CreateStringValue("chromium.org")); - url_pref_list2->Set(2, Value::CreateStringValue("chromium.org")); + base::ListValue* url_pref_list2 = new base::ListValue; + url_pref_list2->Set(0, base::Value::CreateStringValue("chromium.org")); + url_pref_list2->Set(1, base::Value::CreateStringValue("chromium.org")); + url_pref_list2->Set(2, base::Value::CreateStringValue("chromium.org")); pref_service_->SetManagedPref(prefs::kURLsToRestoreOnStartup, url_pref_list2); diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc index 284fec9..43ec5fa 100644 --- a/chrome/browser/prerender/prerender_browsertest.cc +++ b/chrome/browser/prerender/prerender_browsertest.cc @@ -1084,11 +1084,12 @@ class PrerenderBrowserTest : virtual public InProcessBrowserTest { // Returns length of |prerender_manager_|'s history, or -1 on failure. int GetHistoryLength() const { - scoped_ptr<DictionaryValue> prerender_dict( - static_cast<DictionaryValue*>(GetPrerenderManager()->GetAsValue())); + scoped_ptr<base::DictionaryValue> prerender_dict( + static_cast<base::DictionaryValue*>( + GetPrerenderManager()->GetAsValue())); if (!prerender_dict.get()) return -1; - ListValue* history_list; + base::ListValue* history_list; if (!prerender_dict->GetList("history", &history_list)) return -1; return static_cast<int>(history_list->GetSize()); diff --git a/chrome/browser/prerender/prerender_contents.cc b/chrome/browser/prerender/prerender_contents.cc index 1f6bdba..714f85c 100644 --- a/chrome/browser/prerender/prerender_contents.cc +++ b/chrome/browser/prerender/prerender_contents.cc @@ -730,10 +730,10 @@ void PrerenderContents::CommitHistory(WebContents* tab) { history_tab_helper->UpdateHistoryForNavigation(add_page_vector_[i]); } -Value* PrerenderContents::GetAsValue() const { +base::Value* PrerenderContents::GetAsValue() const { if (!prerender_contents_.get()) return NULL; - DictionaryValue* dict_value = new DictionaryValue(); + base::DictionaryValue* dict_value = new base::DictionaryValue(); dict_value->SetString("url", prerender_url_.spec()); base::TimeTicks current_time = base::TimeTicks::Now(); base::TimeDelta duration = current_time - load_start_time_; diff --git a/chrome/browser/prerender/prerender_history.cc b/chrome/browser/prerender/prerender_history.cc index 641ce5d..8640479 100644 --- a/chrome/browser/prerender/prerender_history.cc +++ b/chrome/browser/prerender/prerender_history.cc @@ -29,15 +29,15 @@ void PrerenderHistory::Clear() { entries_.clear(); } -Value* PrerenderHistory::GetEntriesAsValue() const { - ListValue* return_list = new ListValue(); +base::Value* PrerenderHistory::GetEntriesAsValue() const { + base::ListValue* return_list = new base::ListValue(); // Javascript needs times in terms of milliseconds since Jan 1, 1970. base::Time epoch_start = base::Time::UnixEpoch(); for (std::list<Entry>::const_reverse_iterator it = entries_.rbegin(); it != entries_.rend(); ++it) { const Entry& entry = *it; - DictionaryValue* entry_dict = new DictionaryValue(); + base::DictionaryValue* entry_dict = new base::DictionaryValue(); entry_dict->SetString("url", entry.url.spec()); entry_dict->SetString("final_status", NameFromFinalStatus(entry.final_status)); diff --git a/chrome/browser/prerender/prerender_history_unittest.cc b/chrome/browser/prerender/prerender_history_unittest.cc index 4537d6b..2da3c4b 100644 --- a/chrome/browser/prerender/prerender_history_unittest.cc +++ b/chrome/browser/prerender/prerender_history_unittest.cc @@ -11,7 +11,7 @@ namespace prerender { namespace { -bool ListEntryMatches(ListValue* list, +bool ListEntryMatches(base::ListValue* list, size_t index, const char* expected_url, FinalStatus expected_final_status, @@ -19,7 +19,7 @@ bool ListEntryMatches(ListValue* list, const std::string& expected_end_time) { if (index >= list->GetSize()) return false; - DictionaryValue* dict = NULL; + base::DictionaryValue* dict = NULL; if (!list->GetDictionary(index, &dict)) return false; if (dict->size() != 4u) @@ -48,8 +48,8 @@ bool ListEntryMatches(ListValue* list, } TEST(PrerenderHistoryTest, GetAsValue) { - scoped_ptr<Value> entry_value; - ListValue* entry_list = NULL; + scoped_ptr<base::Value> entry_value; + base::ListValue* entry_list = NULL; // Create a history with only 2 values. PrerenderHistory history(2); diff --git a/chrome/browser/prerender/prerender_local_predictor.cc b/chrome/browser/prerender/prerender_local_predictor.cc index f6c0b10..e7ac0fb 100644 --- a/chrome/browser/prerender/prerender_local_predictor.cc +++ b/chrome/browser/prerender/prerender_local_predictor.cc @@ -640,17 +640,17 @@ void PrerenderLocalPredictor::DoPrerenderServiceCheck( } } */ - DictionaryValue json_data; - DictionaryValue* req = new DictionaryValue(); + base::DictionaryValue json_data; + base::DictionaryValue* req = new base::DictionaryValue(); req->SetInteger("version", 1); req->SetInteger("behavior_id", GetPrerenderServiceBehaviorID()); if (ShouldQueryPrerenderServiceForCurrentURL() && info->source_url_.url_lookup_success) { - ListValue* browse_history = new ListValue(); - DictionaryValue* browse_item = new DictionaryValue(); + base::ListValue* browse_history = new base::ListValue(); + base::DictionaryValue* browse_item = new base::DictionaryValue(); browse_item->SetString("url", info->source_url_.url.spec()); browse_history->Append(browse_item); - DictionaryValue* hint_request = new DictionaryValue(); + base::DictionaryValue* hint_request = new base::DictionaryValue(); hint_request->Set("browse_history", browse_history); req->Set("hint_request", hint_request); } @@ -661,16 +661,17 @@ void PrerenderLocalPredictor::DoPrerenderServiceCheck( } if (ShouldQueryPrerenderServiceForCandidateURLs() && num_candidate_urls > 0) { - ListValue* candidates = new ListValue(); - DictionaryValue* candidate; + base::ListValue* candidates = new base::ListValue(); + base::DictionaryValue* candidate; for (int i = 0; i < static_cast<int>(info->candidate_urls_.size()); i++) { if (info->candidate_urls_[i].url_lookup_success) { - candidate = new DictionaryValue(); + candidate = new base::DictionaryValue(); candidate->SetString("url", info->candidate_urls_[i].url.spec()); candidates->Append(candidate); } } - DictionaryValue* candidate_check_request = new DictionaryValue(); + base::DictionaryValue* candidate_check_request = + new base::DictionaryValue(); candidate_check_request->Set("candidates", candidates); req->Set("candidate_check_request", candidate_check_request); } @@ -715,7 +716,7 @@ void PrerenderLocalPredictor::MaybeCancelURLFetcher(net::URLFetcher* fetcher) { } bool PrerenderLocalPredictor::ApplyParsedPrerenderServiceResponse( - DictionaryValue* dict, + base::DictionaryValue* dict, CandidatePrerenderInfo* info, bool* hinting_timed_out, bool* hinting_url_lookup_timed_out, @@ -756,7 +757,7 @@ bool PrerenderLocalPredictor::ApplyParsedPrerenderServiceResponse( } } */ - ListValue* list = NULL; + base::ListValue* list = NULL; int int_value; if (!dict->GetInteger("prerender_response.behavior_id", &int_value) || int_value != GetPrerenderServiceBehaviorID()) { @@ -772,7 +773,7 @@ bool PrerenderLocalPredictor::ApplyParsedPrerenderServiceResponse( } } else { for (size_t i = 0; i < list->GetSize(); i++) { - DictionaryValue* d; + base::DictionaryValue* d; if (!list->GetDictionary(i, &d)) return false; string url_string; @@ -821,7 +822,7 @@ bool PrerenderLocalPredictor::ApplyParsedPrerenderServiceResponse( return false; } else { for (int i = 0; i < static_cast<int>(list->GetSize()); i++) { - DictionaryValue* d; + base::DictionaryValue* d; if (!list->GetDictionary(i, &d)) return false; string url; @@ -873,16 +874,16 @@ void PrerenderLocalPredictor::OnURLFetchComplete( base::Time::Now() - info->start_time_); string result; fetcher->GetResponseAsString(&result); - scoped_ptr<Value> root; + scoped_ptr<base::Value> root; root.reset(base::JSONReader::Read(result)); bool hinting_timed_out = false; bool hinting_url_lookup_timed_out = false; bool candidate_url_lookup_timed_out = false; - if (!root.get() || !root->IsType(Value::TYPE_DICTIONARY)) { + if (!root.get() || !root->IsType(base::Value::TYPE_DICTIONARY)) { RecordEvent(EVENT_PRERENDER_SERVICE_PARSE_ERROR_INCORRECT_JSON); } else { if (ApplyParsedPrerenderServiceResponse( - static_cast<DictionaryValue*>(root.get()), + static_cast<base::DictionaryValue*>(root.get()), info.get(), &hinting_timed_out, &hinting_url_lookup_timed_out, diff --git a/chrome/browser/prerender/prerender_manager.cc b/chrome/browser/prerender/prerender_manager.cc index 890abd3..70f3cdf7 100644 --- a/chrome/browser/prerender/prerender_manager.cc +++ b/chrome/browser/prerender/prerender_manager.cc @@ -1023,9 +1023,9 @@ bool PrerenderManager::DoesSubresourceURLHaveValidScheme(const GURL& url) { return DoesURLHaveValidScheme(url) || url == GURL(content::kAboutBlankURL); } -DictionaryValue* PrerenderManager::GetAsValue() const { +base::DictionaryValue* PrerenderManager::GetAsValue() const { DCHECK(CalledOnValidThread()); - DictionaryValue* dict_value = new DictionaryValue(); + base::DictionaryValue* dict_value = new base::DictionaryValue(); dict_value->Set("history", prerender_history_->GetEntriesAsValue()); dict_value->Set("active", GetActivePrerendersAsValue()); dict_value->SetBoolean("enabled", enabled_); @@ -1662,12 +1662,12 @@ void PrerenderManager::AddToHistory(PrerenderContents* contents) { prerender_history_->AddEntry(entry); } -Value* PrerenderManager::GetActivePrerendersAsValue() const { - ListValue* list_value = new ListValue(); +base::Value* PrerenderManager::GetActivePrerendersAsValue() const { + base::ListValue* list_value = new base::ListValue(); for (ScopedVector<PrerenderData>::const_iterator it = active_prerenders_.begin(); it != active_prerenders_.end(); ++it) { - if (Value* prerender_value = (*it)->contents()->GetAsValue()) + if (base::Value* prerender_value = (*it)->contents()->GetAsValue()) list_value->Append(prerender_value); } return list_value; |