diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-16 07:13:53 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-16 07:13:53 +0000 |
| commit | dc9a67601b9d8c952bf399f0309519273f82bfd5 (patch) | |
| tree | b618c9da1cef3fa99718897cf523cb8768d4a273 /chrome/installer/util/master_preferences_unittest.cc | |
| parent | a6dbaac4225f2fa5a170bdc657ab306390fdc439 (diff) | |
| download | chromium_src-dc9a67601b9d8c952bf399f0309519273f82bfd5.zip chromium_src-dc9a67601b9d8c952bf399f0309519273f82bfd5.tar.gz chromium_src-dc9a67601b9d8c952bf399f0309519273f82bfd5.tar.bz2 | |
Remove deprecated wstring Get(As)String() methods from Value, etc.
BUG=23581
TEST=builds and passes tests
Review URL: http://codereview.chromium.org/3117017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56187 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/util/master_preferences_unittest.cc')
| -rw-r--r-- | chrome/installer/util/master_preferences_unittest.cc | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/chrome/installer/util/master_preferences_unittest.cc b/chrome/installer/util/master_preferences_unittest.cc index 80da133..87b8358 100644 --- a/chrome/installer/util/master_preferences_unittest.cc +++ b/chrome/installer/util/master_preferences_unittest.cc @@ -81,11 +81,11 @@ TEST_F(MasterPreferencesTest, ParseDistroParams) { EXPECT_TRUE(installer_util::GetDistroBooleanPreference(prefs.get(), installer_util::master_preferences::kDistroImportBookmarksPref, &value) && value); - std::wstring str_value; + std::string str_value; EXPECT_TRUE(installer_util::GetDistroStringPreference(prefs.get(), installer_util::master_preferences::kDistroImportBookmarksFromFilePref, &str_value)); - EXPECT_STREQ(L"c:\\foo", str_value.c_str()); + EXPECT_STREQ("c:\\foo", str_value.c_str()); EXPECT_TRUE(installer_util::GetDistroBooleanPreference(prefs.get(), installer_util::master_preferences::kDistroImportHomePagePref, &value) && value); @@ -166,7 +166,7 @@ TEST_F(MasterPreferencesTest, ParseMissingDistroParams) { EXPECT_TRUE(installer_util::GetDistroBooleanPreference(prefs.get(), installer_util::master_preferences::kDistroImportBookmarksPref, &value)); EXPECT_FALSE(value); - std::wstring str_value; + std::string str_value; EXPECT_FALSE(installer_util::GetDistroStringPreference(prefs.get(), installer_util::master_preferences::kDistroImportBookmarksFromFilePref, &str_value)); @@ -241,22 +241,22 @@ TEST(MasterPrefsExtension, ValidateExtensionJSON) { EXPECT_TRUE(installer_util::HasExtensionsBlock(prefs.get(), &extensions)); int location = 0; EXPECT_TRUE(extensions->GetInteger( - L"behllobkkfkfnphdnhnkndlbkcpglgmj.location", &location)); + "behllobkkfkfnphdnhnkndlbkcpglgmj.location", &location)); int state = 0; EXPECT_TRUE(extensions->GetInteger( - L"behllobkkfkfnphdnhnkndlbkcpglgmj.state", &state)); - std::wstring path; + "behllobkkfkfnphdnhnkndlbkcpglgmj.state", &state)); + std::string path; EXPECT_TRUE(extensions->GetString( - L"behllobkkfkfnphdnhnkndlbkcpglgmj.path", &path)); - std::wstring key; + "behllobkkfkfnphdnhnkndlbkcpglgmj.path", &path)); + std::string key; EXPECT_TRUE(extensions->GetString( - L"behllobkkfkfnphdnhnkndlbkcpglgmj.manifest.key", &key)); - std::wstring name; + "behllobkkfkfnphdnhnkndlbkcpglgmj.manifest.key", &key)); + std::string name; EXPECT_TRUE(extensions->GetString( - L"behllobkkfkfnphdnhnkndlbkcpglgmj.manifest.name", &name)); - std::wstring version; + "behllobkkfkfnphdnhnkndlbkcpglgmj.manifest.name", &name)); + std::string version; EXPECT_TRUE(extensions->GetString( - L"behllobkkfkfnphdnhnkndlbkcpglgmj.manifest.version", &version)); + "behllobkkfkfnphdnhnkndlbkcpglgmj.manifest.version", &version)); } // Test that we are parsing master preferences correctly. |