Reset manual zoom mode on navigation.

chrome/browser/ui/zoom/zoom_controller_browsertest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/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"
@@ skipping 46 matching lines @@
   }
 
  private:
   content::WebContents* web_contents_;
   ZoomController::ZoomChangedEventData expected_event_data_;
   scoped_refptr<content::MessageLoopRunner> message_loop_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(ZoomChangedWatcher);
 };
 
-typedef InProcessBrowserTest ZoomControllerBrowserTest;
+class ZoomControllerBrowserTest : public InProcessBrowserTest {
+ public:
+  ZoomControllerBrowserTest() {}
+  ~ZoomControllerBrowserTest() override {}
+
+  void TestResetOnNavigation(ZoomController::ZoomMode zoom_mode) {
+    DCHECK(zoom_mode == ZoomController::ZOOM_MODE_ISOLATED ||
+           zoom_mode == ZoomController::ZOOM_MODE_MANUAL);
+    content::WebContents* web_contents =
+        browser()->tab_strip_model()->GetActiveWebContents();
+    ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(
+        browser(), GURL("about:blank"), 1);
+    ZoomController* zoom_controller =
+        ZoomController::FromWebContents(web_contents);
+    double zoom_level = zoom_controller->GetDefaultZoomLevel();
+    zoom_controller->SetZoomMode(zoom_mode);
+
+    // When the navigation occurs, the zoom_mode will be reset to
+    // ZOOM_MODE_DEFAULT, and this will be reflected in the event that
+    // is generated.
+    ZoomController::ZoomChangedEventData zoom_change_data(
+        web_contents, zoom_level, zoom_level, ZoomController::ZOOM_MODE_DEFAULT,
+        false);
+    ZoomChangedWatcher zoom_change_watcher(web_contents, zoom_change_data);
+
+    ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUISettingsURL));
+    zoom_change_watcher.Wait();
+  }
+};  // ZoomControllerBrowserTest
 
 #if defined(OS_ANDROID)
 #define MAYBE_CrashedTabsDoNotChangeZoom DISABLED_CrashedTabsDoNotChangeZoom
 #else
 #define MAYBE_CrashedTabsDoNotChangeZoom CrashedTabsDoNotChangeZoom
 #endif
 IN_PROC_BROWSER_TEST_F(ZoomControllerBrowserTest,
                        MAYBE_CrashedTabsDoNotChangeZoom) {
   // At the start of the test we are at a tab displaying about:blank.
   content::WebContents* web_contents =
@@ skipping 79 matching lines @@
 
   content::HostZoomMap* host_zoom_map =
       content::HostZoomMap::GetDefaultForBrowserContext(
           web_contents->GetBrowserContext());
 
   host_zoom_map->SetZoomLevelForHost("about:blank", new_zoom_level);
   zoom_change_watcher.Wait();
 }
 
 IN_PROC_BROWSER_TEST_F(ZoomControllerBrowserTest, PerTabModeResetSendsEvent) {
-  content::WebContents* web_contents =
-      browser()->tab_strip_model()->GetActiveWebContents();
-  ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(
-      browser(), GURL("about:blank"), 1);
-  ZoomController* zoom_controller =
-      ZoomController::FromWebContents(web_contents);
-  double zoom_level = zoom_controller->GetDefaultZoomLevel();
-  zoom_controller->SetZoomMode(ZoomController::ZOOM_MODE_ISOLATED);
+  TestResetOnNavigation(ZoomController::ZOOM_MODE_ISOLATED);
+}
 
-  // When the navigation occurs, the ZOOM_MODE_ISOLATED will be reset to
-  // ZOOM_MODE_DEFAULT, and this will be reflected in the event that
-  // is generated.
-  ZoomController::ZoomChangedEventData zoom_change_data(
-      web_contents, zoom_level, zoom_level, ZoomController::ZOOM_MODE_DEFAULT,
-      false);
-  ZoomChangedWatcher zoom_change_watcher(web_contents, zoom_change_data);
-
-  ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUISettingsURL));
-  zoom_change_watcher.Wait();
+// Regression test: crbug.com/450909.
+IN_PROC_BROWSER_TEST_F(ZoomControllerBrowserTest, NavigationResetsManualMode) {
+  TestResetOnNavigation(ZoomController::ZOOM_MODE_MANUAL);
 }
 
 #if !defined(OS_CHROMEOS)
 // Regression test: crbug.com/438979.
 IN_PROC_BROWSER_TEST_F(ZoomControllerBrowserTest,
                        SettingsZoomAfterSigninWorks) {
   GURL signin_url(
       std::string(chrome::kChromeUIChromeSigninURL).append("?source=0"));
   // We open the signin page in a new tab so that the ZoomController is
   // created against the HostZoomMap of the special StoragePartition that
@@ skipping 51 matching lines @@
       web_contents,
       old_zoom_level,
       new_zoom_level,
       ZoomController::ZOOM_MODE_DEFAULT,
       true);  // We have a non-empty host, so this will be 'true'.
   ZoomChangedWatcher zoom_change_watcher(web_contents, zoom_change_data);
   zoom_controller->SetZoomLevel(new_zoom_level);
   zoom_change_watcher.Wait();
 }
 #endif  // !defined(OS_CHROMEOS)