summaryrefslogtreecommitdiffstats
path: root/chrome/browser/host_zoom_map_unittest.cc
diff options
context:
space:
mode:
authorviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-14 02:54:08 +0000
committerviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-14 02:54:08 +0000
commita60153f0ada9823286a54b8b8852526e3e21a5a1 (patch)
treebf359cba11bf294a3b0354cf4f030f2f87b98b4c /chrome/browser/host_zoom_map_unittest.cc
parent87e70062789c3695762c0ddaca1a759e8834398a (diff)
downloadchromium_src-a60153f0ada9823286a54b8b8852526e3e21a5a1.zip
chromium_src-a60153f0ada9823286a54b8b8852526e3e21a5a1.tar.gz
chromium_src-a60153f0ada9823286a54b8b8852526e3e21a5a1.tar.bz2
Remove remaining deprecated wstring DictionaryValue::Get...WithoutPathExpansion()s.
BUG=23581 TEST=builds and passes tests Review URL: http://codereview.chromium.org/3116013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56124 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/host_zoom_map_unittest.cc')
-rw-r--r--chrome/browser/host_zoom_map_unittest.cc11
1 files changed, 4 insertions, 7 deletions
diff --git a/chrome/browser/host_zoom_map_unittest.cc b/chrome/browser/host_zoom_map_unittest.cc
index 4b20a09..bd503ba 100644
--- a/chrome/browser/host_zoom_map_unittest.cc
+++ b/chrome/browser/host_zoom_map_unittest.cc
@@ -63,8 +63,7 @@ TEST_F(HostZoomMapTest, LoadNoPrefs) {
TEST_F(HostZoomMapTest, Load) {
DictionaryValue* dict =
prefs_->GetMutableDictionary(prefs::kPerHostZoomLevels);
- dict->SetWithoutPathExpansion(UTF8ToWide(host_),
- Value::CreateIntegerValue(kZoomLevel));
+ dict->SetWithoutPathExpansion(host_, Value::CreateIntegerValue(kZoomLevel));
scoped_refptr<HostZoomMap> map(new HostZoomMap(&profile_));
EXPECT_EQ(kZoomLevel, map->GetZoomLevel(url_));
}
@@ -78,14 +77,13 @@ TEST_F(HostZoomMapTest, SetZoomLevel) {
const DictionaryValue* dict =
prefs_->GetDictionary(prefs::kPerHostZoomLevels);
int zoom_level = 0;
- EXPECT_TRUE(dict->GetIntegerWithoutPathExpansion(UTF8ToWide(host_),
- &zoom_level));
+ EXPECT_TRUE(dict->GetIntegerWithoutPathExpansion(host_, &zoom_level));
EXPECT_EQ(kZoomLevel, zoom_level);
SetPrefObserverExpectation();
map->SetZoomLevel(url_, 0);
EXPECT_EQ(0, map->GetZoomLevel(url_));
- EXPECT_FALSE(dict->HasKey(UTF8ToWide(host_)));
+ EXPECT_FALSE(dict->HasKey(host_));
prefs_->RemovePrefObserver(prefs::kPerHostZoomLevels, &pref_observer_);
}
@@ -106,8 +104,7 @@ TEST_F(HostZoomMapTest, ReloadOnPrefChange) {
map->SetZoomLevel(url_, kZoomLevel);
DictionaryValue dict;
- dict.SetWithoutPathExpansion(UTF8ToWide(host_),
- Value::CreateIntegerValue(0));
+ dict.SetWithoutPathExpansion(host_, Value::CreateIntegerValue(0));
prefs_->Set(prefs::kPerHostZoomLevels, dict);
EXPECT_EQ(0, map->GetZoomLevel(url_));
}