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 7a6077c7215075e76fa9aab797fc5a2fb1ff2b0b..61258caaf344a90996e9a2b9f3b8616f8730bd63 100644
--- a/chrome/browser/browser_commands_unittest.cc
+++ b/chrome/browser/browser_commands_unittest.cc
@@ -8,6 +8,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/common/url_constants.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
 #include "chrome/test/base/testing_profile.h"
@@ -18,7 +19,7 @@
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
-
+#include "testing/gtest/include/gtest/gtest.h"
 typedef BrowserWithTestWindowTest BrowserCommandsTest;

[Avi (use Gerrit), 2015/02/23 04:51:55]

Blank line above this one.

 
 using bookmarks::BookmarkModel;
@@ -251,7 +252,7 @@ TEST_F(BrowserCommandsTest, OnMaxZoomIn) {
     chrome::UpdateCommandEnabled(browser(), IDC_ZOOM_PLUS, false);
 
   ZoomController* zoom_controller = ZoomController::FromWebContents(contents1);
-  EXPECT_EQ(zoom_controller->GetZoomPercent(), 500.0f);
+  EXPECT_FLOAT_EQ(500.0f, zoom_controller->GetZoomPercent());
   EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_PLUS));
   EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_NORMAL));
   EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_MINUS));
@@ -270,7 +271,7 @@ TEST_F(BrowserCommandsTest, OnMaxZoomOut) {
   }
 
   ZoomController* zoom_controller = ZoomController::FromWebContents(contents1);
-  EXPECT_EQ(zoom_controller->GetZoomPercent(), 25.0f);
+  EXPECT_FLOAT_EQ(25.0f, zoom_controller->GetZoomPercent());
   EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_PLUS));
   EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_NORMAL));
   EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_MINUS));
@@ -287,7 +288,7 @@ TEST_F(BrowserCommandsTest, OnZoomReset) {
   ui_zoom::PageZoom::Zoom(contents1, content::PAGE_ZOOM_RESET);
 
   ZoomController* zoom_controller = ZoomController::FromWebContents(contents1);
-  EXPECT_EQ(zoom_controller->GetZoomPercent(), 100.0f);
+  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));
@@ -305,7 +306,7 @@ TEST_F(BrowserCommandsTest, OnZoomLevelChanged) {
   ui_zoom::PageZoom::Zoom(contents1, content::PAGE_ZOOM_IN);
 
   ZoomController* zoom_controller = ZoomController::FromWebContents(contents1);
-  EXPECT_EQ(zoom_controller->GetZoomPercent(), 110.0f);
+  EXPECT_FLOAT_EQ(110.0f, zoom_controller->GetZoomPercent());
   EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_PLUS));
   EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_NORMAL));
   EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_MINUS));
@@ -323,7 +324,7 @@ TEST_F(BrowserCommandsTest, OnZoomChangedForActiveTab) {
   content::WebContents* contents1 = tab_strip_model->GetWebContentsAt(0);
 
   ZoomController* zoom_controller = ZoomController::FromWebContents(contents1);
-  EXPECT_EQ(zoom_controller->GetZoomPercent(), 100.0f);
+  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));
@@ -336,7 +337,35 @@ TEST_F(BrowserCommandsTest, OnZoomChangedForActiveTab) {
   ui_zoom::PageZoom::Zoom(contents2, content::PAGE_ZOOM_OUT);
 
   zoom_controller = ZoomController::FromWebContents(contents2);
-  EXPECT_EQ(zoom_controller->GetZoomPercent(), 90.0f);
+  EXPECT_FLOAT_EQ(90.0f, zoom_controller->GetZoomPercent());
+  EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_PLUS));
+  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);

[Avi (use Gerrit), 2015/02/23 04:51:55]

You have a using statement above, so you shouldn't need the "content::".

+  ZoomController* zoom_controller = ZoomController::FromWebContents(contents);
+
+  // Set the default zoom level to 125.
+  profile()->GetZoomLevelPrefs()->SetDefaultZoomLevelPref(
+        content::ZoomFactorToZoomLevel(1.25));
+  EXPECT_FLOAT_EQ(125.0f, zoom_controller->GetZoomPercent());
+
+  // 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.
+  ui_zoom::PageZoom::Zoom(contents, 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));