diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-01 08:28:03 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-01 08:28:03 +0000 |
| commit | 2de28d9625d176079e04850ee5b9f545f38452ac (patch) | |
| tree | 7d24ba2771bebfd1fb4b8f64a2987c6be3f94995 /chrome/browser/host_zoom_map_unittest.cc | |
| parent | 979b1062b2f1039396b48a0895a9b76ca832c77b (diff) | |
| download | chromium_src-2de28d9625d176079e04850ee5b9f545f38452ac.zip chromium_src-2de28d9625d176079e04850ee5b9f545f38452ac.tar.gz chromium_src-2de28d9625d176079e04850ee5b9f545f38452ac.tar.bz2 | |
Fix zoom unit test and add missing break in zoom map code.
Review URL: http://codereview.chromium.org/3524006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61157 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/host_zoom_map_unittest.cc')
| -rw-r--r-- | chrome/browser/host_zoom_map_unittest.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/host_zoom_map_unittest.cc b/chrome/browser/host_zoom_map_unittest.cc index 5d206e1..5899165 100644 --- a/chrome/browser/host_zoom_map_unittest.cc +++ b/chrome/browser/host_zoom_map_unittest.cc @@ -26,7 +26,7 @@ using testing::Property; class HostZoomMapTest : public testing::Test { public: - static const int kZoomLevel; + static const double kZoomLevel; HostZoomMapTest() : ui_thread_(ChromeThread::UI, &message_loop_), prefs_(profile_.GetPrefs()), @@ -53,7 +53,7 @@ class HostZoomMapTest : public testing::Test { std::string host_; NotificationObserverMock pref_observer_; }; -const int HostZoomMapTest::kZoomLevel = 42; +const double HostZoomMapTest::kZoomLevel = 4; TEST_F(HostZoomMapTest, LoadNoPrefs) { scoped_refptr<HostZoomMap> map(new HostZoomMap(&profile_)); @@ -63,7 +63,7 @@ TEST_F(HostZoomMapTest, LoadNoPrefs) { TEST_F(HostZoomMapTest, Load) { DictionaryValue* dict = prefs_->GetMutableDictionary(prefs::kPerHostZoomLevels); - dict->SetWithoutPathExpansion(host_, Value::CreateIntegerValue(kZoomLevel)); + dict->SetWithoutPathExpansion(host_, Value::CreateRealValue(kZoomLevel)); scoped_refptr<HostZoomMap> map(new HostZoomMap(&profile_)); EXPECT_EQ(kZoomLevel, map->GetZoomLevel(url_)); } @@ -78,8 +78,8 @@ TEST_F(HostZoomMapTest, SetZoomLevel) { EXPECT_EQ(kZoomLevel, map->GetZoomLevel(url_)); const DictionaryValue* dict = prefs_->GetDictionary(prefs::kPerHostZoomLevels); - int zoom_level = 0; - EXPECT_TRUE(dict->GetIntegerWithoutPathExpansion(host_, &zoom_level)); + double zoom_level = 0; + EXPECT_TRUE(dict->GetRealWithoutPathExpansion(host_, &zoom_level)); EXPECT_EQ(kZoomLevel, zoom_level); SetPrefObserverExpectation(); @@ -106,7 +106,7 @@ TEST_F(HostZoomMapTest, ReloadOnPrefChange) { map->SetZoomLevel(url_, kZoomLevel); DictionaryValue dict; - dict.SetWithoutPathExpansion(host_, Value::CreateIntegerValue(0)); + dict.SetWithoutPathExpansion(host_, Value::CreateRealValue(0)); prefs_->Set(prefs::kPerHostZoomLevels, dict); EXPECT_EQ(0, map->GetZoomLevel(url_)); } |