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

chrome/browser/ui/cocoa/location_bar/zoom_decoration_browsertest.mm

Index: chrome/browser/ui/cocoa/location_bar/zoom_decoration_browsertest.mm
diff --git a/chrome/browser/ui/cocoa/location_bar/zoom_decoration_browsertest.mm b/chrome/browser/ui/cocoa/location_bar/zoom_decoration_browsertest.mm
index 94d45ea34fd05bf8bf5fd0b493fe7c4a644bce50..964e4ad9c95f33a54a3133f933cc2e9ca2e541b0 100644
--- a/chrome/browser/ui/cocoa/location_bar/zoom_decoration_browsertest.mm
+++ b/chrome/browser/ui/cocoa/location_bar/zoom_decoration_browsertest.mm
@@ -15,8 +15,8 @@
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "components/toolbar/test_toolbar_model.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/host_zoom_map.h"
 #include "content/public/test/test_utils.h"
 
@@ -59,7 +59,7 @@ class ZoomDecorationTest : public InProcessBrowserTest {
         browser()->tab_strip_model()->GetActiveWebContents();
 
     base::AutoReset<bool> reset(&should_quit_on_zoom_, true);
-    ui_zoom::PageZoom::Zoom(web_contents, zoom);
+    zoom::PageZoom::Zoom(web_contents, zoom);
     content::RunMessageLoop();
   }
 
@@ -89,8 +89,8 @@ IN_PROC_BROWSER_TEST_F(ZoomDecorationTest, BubbleAtDefaultZoom) {
   // Since we now need to be able to show the zoom bubble as a notification
   // on non-active pages, this test should be revised to account for
   // these notifications.
-  ui_zoom::ZoomController::FromWebContents(
-      GetLocationBar()->GetWebContents())->SetShowsNotificationBubble(false);
+  zoom::ZoomController::FromWebContents(GetLocationBar()->GetWebContents())
+      ->SetShowsNotificationBubble(false);
 
   // Zoom in and reset.
   EXPECT_FALSE(zoom_decoration->IsVisible());
@@ -116,8 +116,8 @@ IN_PROC_BROWSER_TEST_F(ZoomDecorationTest, IconRemainsVisibleAfterBubble) {
   ZoomDecoration* zoom_decoration = GetZoomDecoration();
 
   // See comment in BubbleAtDefaultZoom regarding this next line.
-  ui_zoom::ZoomController::FromWebContents(
-      GetLocationBar()->GetWebContents())->SetShowsNotificationBubble(false);
+  zoom::ZoomController::FromWebContents(GetLocationBar()->GetWebContents())
+      ->SetShowsNotificationBubble(false);
 
   // Zoom in to turn on decoration icon.
   EXPECT_FALSE(zoom_decoration->IsVisible());