Make command-zero reset page scale in addition to zoom level

chrome/browser/browser_commands_unittest.cc

 // Copyright (c) 2012 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 "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/ui/browser_command_controller.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ skipping 275 matching lines @@
   WebContents* first_tab = tab_strip_model->GetWebContentsAt(0);
 
   // Change the zoom percentage to 100.
   ui_zoom::PageZoom::Zoom(first_tab, content::PAGE_ZOOM_RESET);
 
   ZoomController* zoom_controller = ZoomController::FromWebContents(first_tab);
   EXPECT_FLOAT_EQ(100.0f, zoom_controller->GetZoomPercent());
   EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_PLUS));
   EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_NORMAL));
   EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_MINUS));
+
+  // Changing the page scale factor will re-enable IDC_ZOOM_NORMAL
+  zoom_controller->SetPageScaleFactorIsOneForTesting(false);
+  EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_NORMAL));
 }
 
 TEST_F(BrowserCommandsTest, OnZoomLevelChanged) {
   TabStripModel* tab_strip_model = browser()->tab_strip_model();
 
   GURL url("http://www.google.com");
   AddTab(browser(), url);
   WebContents* first_tab = tab_strip_model->GetWebContentsAt(0);
 
   // Changing zoom percentage from default should enable all the zoom
@@ skipping 58 matching lines @@
   // Change the zoom level.
   ui_zoom::PageZoom::Zoom(tab, content::PAGE_ZOOM_IN);
 
   EXPECT_FLOAT_EQ(150.0f, zoom_controller->GetZoomPercent());
 
   // Tab no longer at default zoom hence actual size should be enabled.
   EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_PLUS));
   EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_NORMAL));
   EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_MINUS));
 }