Default zoom was never read from chrome://settings

chrome/browser/browser_commands_unittest.cc

Index: chrome/browser/browser_commands_unittest.cc
diff --git a/chrome/browser/browser_commands_unittest.cc b/chrome/browser/browser_commands_unittest.cc
index d9ca97424de7f736d6dc3386c7d1c96e3b028404..7faea0dffb99ad18ab0a127a24939cd63b080b9c 100644
--- a/chrome/browser/browser_commands_unittest.cc
+++ b/chrome/browser/browser_commands_unittest.cc
@@ -9,6 +9,7 @@
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/browser/ui/zoom/chrome_zoom_level_prefs.h"
 #include "chrome/browser/ui/zoom/zoom_controller.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
@@ -339,3 +340,32 @@ TEST_F(BrowserCommandsTest, OnZoomChangedForActiveTab) {
   EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_NORMAL));
   EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_MINUS));
 }
+
+TEST_F(BrowserCommandsTest, OnDefaultZoomLevelChanged) {
+  TabStripModel* tab_strip_model = browser()->tab_strip_model();
+  GURL url("http://code.google.com");
+  AddTab(browser(), url);
+  content::WebContents* contents = tab_strip_model->GetWebContentsAt(0);
+  ZoomController* zoom_controller = ZoomController::FromWebContents(contents);
+
+  // Set the default zoom level to 125.
+  profile()->GetZoomLevelPrefs()->SetDefaultZoomLevelPref(
+        content::ZoomFactorToZoomLevel(1.25));
+  EXPECT_EQ(zoom_controller->GetZoomPercent(), 125);

[sky, 2014/11/24 15:46:57]

Format for assertions in tests is 'expected, actual.' I think you have it
backwards throughout this test.

+
+  // Actual Size from context menu should be disabled now.
+  EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_PLUS));
+  EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_NORMAL));
+  EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_MINUS));
+
+  // Change the zoom level.
+  chrome_page_zoom::Zoom(contents, content::PAGE_ZOOM_IN);
+
+  EXPECT_EQ(zoom_controller->GetZoomPercent(), 150);
+
+  // 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));
+}
+