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

chrome/browser/ui/zoom/zoom_controller_unittest.cc

 // Copyright (c) 2012 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/message_loop/message_loop.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/prefs/pref_service.h"
-#include "components/ui/zoom/test/zoom_test_utils.h"
-#include "components/ui/zoom/zoom_controller.h"
-#include "components/ui/zoom/zoom_observer.h"
+#include "components/zoom/test/zoom_test_utils.h"
+#include "components/zoom/zoom_controller.h"
+#include "components/zoom/zoom_observer.h"
 #include "content/public/browser/host_zoom_map.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/common/frame_navigate_params.h"
 #include "content/public/test/test_renderer_host.h"
 #include "content/public/test/test_utils.h"
 #include "ipc/ipc_message.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using ui_zoom::ZoomChangedWatcher;
-using ui_zoom::ZoomController;
+using zoom::ZoomChangedWatcher;
+using zoom::ZoomController;
 
 class ZoomControllerTest : public ChromeRenderViewHostTestHarness {
  public:
   void SetUp() override {
     ChromeRenderViewHostTestHarness::SetUp();
     zoom_controller_.reset(new ZoomController(web_contents()));
 
     // This call is needed so that the RenderViewHost reports being alive. This
     // is only important for tests that call ZoomController::SetZoomLevel().
     content::RenderViewHostTester::For(rvh())->CreateTestRenderView(
@@ skipping 58 matching lines @@
     zoom_change_watcher2.Wait();
   }
 }
 
 TEST_F(ZoomControllerTest, ObserveManualZoomCanShowBubble) {
   NavigateAndCommit(GURL("about:blank"));
   double old_zoom_level = zoom_controller_->GetZoomLevel();
   double new_zoom_level1 = old_zoom_level + 0.5;
   double new_zoom_level2 = old_zoom_level + 1.0;
 
-  zoom_controller_->SetZoomMode(ui_zoom::ZoomController::ZOOM_MODE_MANUAL);
+  zoom_controller_->SetZoomMode(zoom::ZoomController::ZOOM_MODE_MANUAL);
   // By default, the zoom controller will send 'true' for can_show_bubble.
   ZoomController::ZoomChangedEventData zoom_change_data1(
       web_contents(),
       old_zoom_level,
       new_zoom_level1,
       ZoomController::ZOOM_MODE_MANUAL,
       true /* can_show_bubble */);
   {
     ZoomChangedWatcher zoom_change_watcher1(zoom_controller_.get(),
                                             zoom_change_data1);
@@ skipping 10 matching lines @@
       ZoomController::ZOOM_MODE_MANUAL,
       false /* can_show_bubble */);
   {
     ZoomChangedWatcher zoom_change_watcher2(zoom_controller_.get(),
                                             zoom_change_data2);
     zoom_controller_->SetZoomLevel(new_zoom_level2);
     zoom_change_watcher2.Wait();
   }
 
 }