Move //components/ui/zoom to top-level under //components

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 36793781bf8bd0d4f4094c97121c69dcd7682733..5d1a60bc08e992e57641434acb67bcff13017e38 100644
--- a/chrome/browser/browser_commands_unittest.cc
+++ b/chrome/browser/browser_commands_unittest.cc
@@ -16,8 +16,8 @@
 #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 "components/zoom/page_zoom.h"
+#include "components/zoom/zoom_controller.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
@@ -30,7 +30,7 @@ using bookmarks::BookmarkModel;
 using content::OpenURLParams;
 using content::Referrer;
 using content::WebContents;
-using ui_zoom::ZoomController;
+using zoom::ZoomController;
 
 // Tests IDC_SELECT_TAB_0, IDC_SELECT_NEXT_TAB, IDC_SELECT_PREVIOUS_TAB and
 // IDC_SELECT_LAST_TAB.
@@ -258,7 +258,7 @@ TEST_F(BrowserCommandsTest, OnMaxZoomIn) {
 
   // Continue to zoom in until zoom percent reaches 500.
   for (int i = 0; i < 9; ++i) {
-    ui_zoom::PageZoom::Zoom(first_tab, content::PAGE_ZOOM_IN);
+    zoom::PageZoom::Zoom(first_tab, content::PAGE_ZOOM_IN);
   }
 
   // TODO(a.sarkar.arun@gmail.com): Figure out why Zoom-In menu item is not
@@ -283,7 +283,7 @@ TEST_F(BrowserCommandsTest, OnMaxZoomOut) {
 
   // Continue to zoom out until zoom percent reaches 25.
   for (int i = 0; i < 7; ++i) {
-    ui_zoom::PageZoom::Zoom(first_tab, content::PAGE_ZOOM_OUT);
+    zoom::PageZoom::Zoom(first_tab, content::PAGE_ZOOM_OUT);
   }
 
   ZoomController* zoom_controller = ZoomController::FromWebContents(first_tab);
@@ -301,7 +301,7 @@ TEST_F(BrowserCommandsTest, OnZoomReset) {
   WebContents* first_tab = tab_strip_model->GetWebContentsAt(0);
 
   // Change the zoom percentage to 100.
-  ui_zoom::PageZoom::Zoom(first_tab, content::PAGE_ZOOM_RESET);
+  zoom::PageZoom::Zoom(first_tab, content::PAGE_ZOOM_RESET);
 
   ZoomController* zoom_controller = ZoomController::FromWebContents(first_tab);
   EXPECT_FLOAT_EQ(100.0f, zoom_controller->GetZoomPercent());
@@ -323,7 +323,7 @@ TEST_F(BrowserCommandsTest, OnZoomLevelChanged) {
 
   // Changing zoom percentage from default should enable all the zoom
   // NSMenuItems.
-  ui_zoom::PageZoom::Zoom(first_tab, content::PAGE_ZOOM_IN);
+  zoom::PageZoom::Zoom(first_tab, content::PAGE_ZOOM_IN);
 
   ZoomController* zoom_controller = ZoomController::FromWebContents(first_tab);
   EXPECT_FLOAT_EQ(110.0f, zoom_controller->GetZoomPercent());
@@ -354,7 +354,7 @@ TEST_F(BrowserCommandsTest, OnZoomChangedForActiveTab) {
 
   tab_strip_model->ActivateTabAt(1, true);
   EXPECT_TRUE(tab_strip_model->IsTabSelected(1));
-  ui_zoom::PageZoom::Zoom(second_tab, content::PAGE_ZOOM_OUT);
+  zoom::PageZoom::Zoom(second_tab, content::PAGE_ZOOM_OUT);
 
   zoom_controller = ZoomController::FromWebContents(second_tab);
   EXPECT_FLOAT_EQ(90.0f, zoom_controller->GetZoomPercent());
@@ -381,7 +381,7 @@ TEST_F(BrowserCommandsTest, OnDefaultZoomLevelChanged) {
   EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_MINUS));
 
   // Change the zoom level.
-  ui_zoom::PageZoom::Zoom(tab, content::PAGE_ZOOM_IN);
+  zoom::PageZoom::Zoom(tab, content::PAGE_ZOOM_IN);
 
   EXPECT_FLOAT_EQ(150.0f, zoom_controller->GetZoomPercent());