Migrate HostZoomMap to live in StoragePartition.

chrome/browser/ui/zoom/zoom_controller_browsertest.cc

Index: chrome/browser/ui/zoom/zoom_controller_browsertest.cc
diff --git a/chrome/browser/ui/zoom/zoom_controller_browsertest.cc b/chrome/browser/ui/zoom/zoom_controller_browsertest.cc
index 1d44bcc9e476756b6710d261274b2bd8ac0b69e5..4ac9c9dfc1ae21fea4f986896ba9c112f04aeacb 100644
--- a/chrome/browser/ui/zoom/zoom_controller_browsertest.cc
+++ b/chrome/browser/ui/zoom/zoom_controller_browsertest.cc
@@ -4,16 +4,38 @@
 
 #include "chrome/browser/ui/zoom/zoom_controller.h"
 
+#include "base/prefs/pref_service.h"
 #include "base/process/kill.h"
+#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/common/pref_names.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
+#include "testing/gmock/include/gmock/gmock.h"
 
-typedef InProcessBrowserTest ZoomControllerBrowserTest;
+bool operator==(const ZoomController::ZoomChangedEventData& lhs,
+                const ZoomController::ZoomChangedEventData& rhs) {
+  return lhs.web_contents == rhs.web_contents &&
+         lhs.old_zoom_level == rhs.old_zoom_level &&
+         lhs.new_zoom_level == rhs.new_zoom_level &&
+         lhs.zoom_mode == rhs.zoom_mode &&
+         lhs.can_show_bubble == rhs.can_show_bubble;
+}
+
+class TestZoomObserver : public ZoomObserver {
+ public:
+  MOCK_METHOD1(OnZoomChanged,
+               void(const ZoomController::ZoomChangedEventData&));
+};
+
+class ZoomControllerBrowserTest: public InProcessBrowserTest {
+ protected:
+  TestZoomObserver zoom_observer_;
+};
 
 // TODO(wjmaclean): Enable this on Android when we can kill the process there.
 #if defined(OS_ANDROID)
@@ -47,3 +69,50 @@ IN_PROC_BROWSER_TEST_F(ZoomControllerBrowserTest,
   zoom_controller->SetZoomLevel(new_zoom_level);
   EXPECT_FLOAT_EQ(old_zoom_level, zoom_controller->GetZoomLevel());
 }
+
+IN_PROC_BROWSER_TEST_F(ZoomControllerBrowserTest, OnPreferenceChanged) {
+  content::WebContents* web_contents =
+      browser()->tab_strip_model()->GetActiveWebContents();
+  ZoomController* zoom_controller =
+      ZoomController::FromWebContents(web_contents);
+  zoom_controller->AddObserver(&zoom_observer_);
+  double new_default_zoom_level =  1.0;
+  // Since this page uses the default zoom level, the changes to the default
+  // zoom level will change the zoom level for this web_contents.
+  ZoomController::ZoomChangedEventData zoom_change_data(
+      web_contents,
+      new_default_zoom_level,
+      new_default_zoom_level,
+      ZoomController::ZOOM_MODE_DEFAULT,
+      false);
+  EXPECT_CALL(zoom_observer_, OnZoomChanged(zoom_change_data)).Times(1);
+  browser()->profile()->GetZoomLevelPrefs()->SetDouble(prefs::kDefaultZoomLevel,
+                                                       new_default_zoom_level);
+}
+
+IN_PROC_BROWSER_TEST_F(ZoomControllerBrowserTest, Observe) {
+  content::WebContents* web_contents =
+      browser()->tab_strip_model()->GetActiveWebContents();
+  ZoomController* zoom_controller =
+      ZoomController::FromWebContents(web_contents);
+  zoom_controller->AddObserver(&zoom_observer_);
+
+  double new_zoom_level = 1.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,
+      true);  // We have a non-empty host, so this will be 'true'.
+  EXPECT_CALL(zoom_observer_, OnZoomChanged(zoom_change_data)).Times(1);
+
+  content::HostZoomMap* host_zoom_map =
+      content::HostZoomMap::GetDefaultForBrowserContext(
+          web_contents->GetBrowserContext());
+
+  host_zoom_map->SetZoomLevelForHost("about:blank", new_zoom_level);
+}
+
+