Migrate HostZoomMap to live in StoragePartition.

chrome/browser/ui/zoom/zoom_controller_unittest.cc

Index: chrome/browser/ui/zoom/zoom_controller_unittest.cc
diff --git a/chrome/browser/ui/zoom/zoom_controller_unittest.cc b/chrome/browser/ui/zoom/zoom_controller_unittest.cc
index 82e3372d503fd183d707d06370c74951a15b49b3..536a54d3635d8292ebc0a74def47a78e458d38a9 100644
--- a/chrome/browser/ui/zoom/zoom_controller_unittest.cc
+++ b/chrome/browser/ui/zoom/zoom_controller_unittest.cc
@@ -65,42 +65,6 @@ TEST_F(ZoomControllerTest, DidNavigateMainFrame) {
                                          content::FrameNavigateParams());
 }
 
-TEST_F(ZoomControllerTest, OnPreferenceChanged) {
-  double zoom_level = zoom_controller_->GetZoomLevel();
-  // Note that while the change in the default zoom level triggers an event,
-  // the current zoom level for this web contents does not change since the
-  // default zoom level in HostZoomMap is not updated.
-  // TODO(wjmaclean) Make sure changes to the default zoom level in preferences
-  // propagate to HostZoomMap. http://crbug.com/391484
-  ZoomController::ZoomChangedEventData zoom_change_data(
-      web_contents(),
-      zoom_level,
-      zoom_level,
-      ZoomController::ZOOM_MODE_DEFAULT,
-      false);
-  EXPECT_CALL(zoom_observer_, OnZoomChanged(zoom_change_data)).Times(1);
-  profile()->GetPrefs()->SetDouble(prefs::kDefaultZoomLevel, 110.0);
-}
-
-TEST_F(ZoomControllerTest, Observe) {
-  double new_zoom_level = 110.0;
-  // When the event is initiated from HostZoomMap, the old zoom level is not
-  // available.
-  ZoomController::ZoomChangedEventData zoom_change_data(
-      web_contents(),
-      new_zoom_level,
-      new_zoom_level,
-      ZoomController::ZOOM_MODE_DEFAULT,
-      false);
-  EXPECT_CALL(zoom_observer_, OnZoomChanged(zoom_change_data)).Times(1);
-
-  content::HostZoomMap* host_zoom_map =
-      content::HostZoomMap::GetForBrowserContext(
-          web_contents()->GetBrowserContext());
-
-  host_zoom_map->SetZoomLevelForHost(std::string(), new_zoom_level);
-}
-
 TEST_F(ZoomControllerTest, Observe_ZoomController) {
   double old_zoom_level = zoom_controller_->GetZoomLevel();
   double new_zoom_level = 110.0;