| Index: chrome/browser/host_zoom_map_unittest.cc
|
| diff --git a/chrome/browser/host_zoom_map_unittest.cc b/chrome/browser/host_zoom_map_unittest.cc
|
| index 82e0e588e41f66f47e9c6d9e918095fd867c2373..15e888e31964ae40caf9f1304c471463c6622ca0 100644
|
| --- a/chrome/browser/host_zoom_map_unittest.cc
|
| +++ b/chrome/browser/host_zoom_map_unittest.cc
|
| @@ -25,6 +25,7 @@ using testing::Property;
|
|
|
| class HostZoomMapTest : public testing::Test {
|
| public:
|
| + static const double kRequestId;
|
| static const double kZoomLevel;
|
| static const double kDefaultZoomLevel;
|
| HostZoomMapTest()
|
| @@ -53,6 +54,7 @@ class HostZoomMapTest : public testing::Test {
|
| std::string host_;
|
| NotificationObserverMock pref_observer_;
|
| };
|
| +const double HostZoomMapTest::kRequestId = 1;
|
| const double HostZoomMapTest::kZoomLevel = 4;
|
| const double HostZoomMapTest::kDefaultZoomLevel = -2;
|
|
|
| @@ -75,7 +77,7 @@ TEST_F(HostZoomMapTest, SetZoomLevel) {
|
| registrar.Init(prefs_);
|
| registrar.Add(prefs::kPerHostZoomLevels, &pref_observer_);
|
| SetPrefObserverExpectation();
|
| - map->SetZoomLevel(url_, kZoomLevel);
|
| + map->SetZoomLevel(url_, kRequestId, kZoomLevel);
|
| EXPECT_EQ(kZoomLevel, map->GetZoomLevel(url_));
|
| const DictionaryValue* dict =
|
| prefs_->GetDictionary(prefs::kPerHostZoomLevels);
|
| @@ -84,14 +86,14 @@ TEST_F(HostZoomMapTest, SetZoomLevel) {
|
| EXPECT_EQ(kZoomLevel, zoom_level);
|
|
|
| SetPrefObserverExpectation();
|
| - map->SetZoomLevel(url_, 0);
|
| + map->SetZoomLevel(url_, kRequestId, 0);
|
| EXPECT_EQ(0, map->GetZoomLevel(url_));
|
| EXPECT_FALSE(dict->HasKey(host_));
|
| }
|
|
|
| TEST_F(HostZoomMapTest, ResetToDefaults) {
|
| scoped_refptr<HostZoomMap> map(new HostZoomMap(&profile_));
|
| - map->SetZoomLevel(url_, kZoomLevel);
|
| + map->SetZoomLevel(url_, kRequestId, kZoomLevel);
|
|
|
| PrefChangeRegistrar registrar;
|
| registrar.Init(prefs_);
|
| @@ -106,7 +108,7 @@ TEST_F(HostZoomMapTest, ResetToDefaults) {
|
|
|
| TEST_F(HostZoomMapTest, ReloadOnPrefChange) {
|
| scoped_refptr<HostZoomMap> map(new HostZoomMap(&profile_));
|
| - map->SetZoomLevel(url_, kZoomLevel);
|
| + map->SetZoomLevel(url_, kRequestId, kZoomLevel);
|
|
|
| DictionaryValue dict;
|
| dict.SetWithoutPathExpansion(host_, Value::CreateDoubleValue(0));
|
| @@ -118,7 +120,7 @@ TEST_F(HostZoomMapTest, NoHost) {
|
| scoped_refptr<HostZoomMap> map(new HostZoomMap(&profile_));
|
| GURL file_url1_("file:///tmp/test.html");
|
| GURL file_url2_("file:///tmp/other.html");
|
| - map->SetZoomLevel(file_url1_, kZoomLevel);
|
| + map->SetZoomLevel(file_url1_, kRequestId, kZoomLevel);
|
|
|
| EXPECT_EQ(kZoomLevel, map->GetZoomLevel(file_url1_));
|
| EXPECT_EQ(0, map->GetZoomLevel(file_url2_));
|
|
|