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

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/macros.h"
 #import "chrome/browser/ui/cocoa/location_bar/zoom_decoration.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
-#include "components/ui/zoom/zoom_controller.h"
+#include "components/zoom/zoom_controller.h"
 
 namespace {
 
 class ZoomDecorationTest : public ChromeRenderViewHostTestHarness {};
 
 class MockZoomDecoration : public ZoomDecoration {
  public:
   explicit MockZoomDecoration(LocationBarViewMac* owner)
       : ZoomDecoration(owner), update_ui_count_(0) {}
   bool ShouldShowDecoration() const override { return true; }
-  void ShowAndUpdateUI(ui_zoom::ZoomController* zoom_controller,
+  void ShowAndUpdateUI(zoom::ZoomController* zoom_controller,
                        NSString* tooltip_string,
                        bool location_bar_is_dark) override {
     ++update_ui_count_;
     ZoomDecoration::ShowAndUpdateUI(zoom_controller,
                                     tooltip_string,
                                     location_bar_is_dark);
   }
 
   int update_ui_count_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockZoomDecoration);
 };
 
-class MockZoomController : public ui_zoom::ZoomController {
+class MockZoomController : public zoom::ZoomController {
  public:
   explicit MockZoomController(content::WebContents* web_contents)
-      : ui_zoom::ZoomController(web_contents) {}
+      : zoom::ZoomController(web_contents) {}
   int GetZoomPercent() const override { return zoom_percent_; }
 
   int zoom_percent_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockZoomController);
 };
 
 // Test that UpdateIfNecessary performs redraws only when the zoom percent
 // changes.
@@ skipping 19 matching lines @@
   EXPECT_EQ(2, decoration.update_ui_count_);
 
   // Always redraw if the default zoom changes.
   decoration.UpdateIfNecessary(&controller,
                                /*default_zoom_changed=*/true,
                                false);
   EXPECT_EQ(3, decoration.update_ui_count_);
 }
 
 }  // namespace