Refactor to move chrome_page_zoom functions to components/ui/zoom.

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 f6cd8056ffeff308d856beb48053c207f587aa4a..7a6077c7215075e76fa9aab797fc5a2fb1ff2b0b 100644
--- a/chrome/browser/browser_commands_unittest.cc
+++ b/chrome/browser/browser_commands_unittest.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
-#include "chrome/browser/chrome_page_zoom.h"
 #include "chrome/browser/ui/browser_command_controller.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
@@ -14,6 +13,7 @@
 #include "chrome/test/base/testing_profile.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/test/bookmark_test_helpers.h"
+#include "components/ui/zoom/page_zoom.h"
 #include "components/ui/zoom/zoom_controller.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
@@ -241,7 +241,7 @@ TEST_F(BrowserCommandsTest, OnMaxZoomIn) {
 
   // Continue to zoom in until zoom percent reaches 500.
   for (int i = 0; i < 9; ++i) {
-    chrome_page_zoom::Zoom(contents1, content::PAGE_ZOOM_IN);
+    ui_zoom::PageZoom::Zoom(contents1, content::PAGE_ZOOM_IN);
   }
 
   // TODO(a.sarkar.arun@gmail.com): Figure out why Zoom-In menu item is not
@@ -266,7 +266,7 @@ TEST_F(BrowserCommandsTest, OnMaxZoomOut) {
 
   // Continue to zoom out until zoom percent reaches 25.
   for (int i = 0; i < 7; ++i) {
-    chrome_page_zoom::Zoom(contents1, content::PAGE_ZOOM_OUT);
+    ui_zoom::PageZoom::Zoom(contents1, content::PAGE_ZOOM_OUT);
   }
 
   ZoomController* zoom_controller = ZoomController::FromWebContents(contents1);
@@ -284,7 +284,7 @@ TEST_F(BrowserCommandsTest, OnZoomReset) {
   content::WebContents* contents1 = tab_strip_model->GetWebContentsAt(0);
 
   // Change the zoom percentage to 100.
-  chrome_page_zoom::Zoom(contents1, content::PAGE_ZOOM_RESET);
+  ui_zoom::PageZoom::Zoom(contents1, content::PAGE_ZOOM_RESET);
 
   ZoomController* zoom_controller = ZoomController::FromWebContents(contents1);
   EXPECT_EQ(zoom_controller->GetZoomPercent(), 100.0f);
@@ -302,7 +302,7 @@ TEST_F(BrowserCommandsTest, OnZoomLevelChanged) {
 
   // Changing zoom percentage from default should enable all the zoom
   // NSMenuItems.
-  chrome_page_zoom::Zoom(contents1, content::PAGE_ZOOM_IN);
+  ui_zoom::PageZoom::Zoom(contents1, content::PAGE_ZOOM_IN);
 
   ZoomController* zoom_controller = ZoomController::FromWebContents(contents1);
   EXPECT_EQ(zoom_controller->GetZoomPercent(), 110.0f);
@@ -333,7 +333,7 @@ TEST_F(BrowserCommandsTest, OnZoomChangedForActiveTab) {
 
   tab_strip_model->ActivateTabAt(1, true);
   EXPECT_TRUE(tab_strip_model->IsTabSelected(1));
-  chrome_page_zoom::Zoom(contents2, content::PAGE_ZOOM_OUT);
+  ui_zoom::PageZoom::Zoom(contents2, content::PAGE_ZOOM_OUT);
 
   zoom_controller = ZoomController::FromWebContents(contents2);
   EXPECT_EQ(zoom_controller->GetZoomPercent(), 90.0f);