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

chrome/browser/profiles/host_zoom_map_browsertest.cc

 // 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 <stddef.h>
 
 #include <algorithm>
 #include <memory>
 #include <string>
 #include <vector>
@@ skipping 16 matching lines @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/prefs/pref_service.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "components/signin/core/common/signin_switches.h"
-#include "components/ui/zoom/page_zoom.h"
-#include "components/ui/zoom/zoom_event_manager.h"
+#include "components/zoom/page_zoom.h"
+#include "components/zoom/zoom_event_manager.h"
 #include "content/public/browser/host_zoom_map.h"
 #include "content/public/test/test_utils.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/embedded_test_server/http_response.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "url/gurl.h"
 
 using content::HostZoomMap;
 
 namespace {
 
 class ZoomLevelChangeObserver {
  public:
   explicit ZoomLevelChangeObserver(content::BrowserContext* context)
       : message_loop_runner_(new content::MessageLoopRunner) {
-    subscription_ = ui_zoom::ZoomEventManager::GetForBrowserContext(context)
+    subscription_ = zoom::ZoomEventManager::GetForBrowserContext(context)
                         ->AddZoomLevelChangedCallback(base::Bind(
                             &ZoomLevelChangeObserver::OnZoomLevelChanged,
                             base::Unretained(this)));
   }
 
   void BlockUntilZoomLevelForHostHasChanged(const std::string& host) {
     while (!std::count(changed_hosts_.begin(), changed_hosts_.end(), host)) {
       message_loop_runner_->Run();
       message_loop_runner_ = new content::MessageLoopRunner;
     }
@@ skipping 223 matching lines @@
 
   GURL test_url2 = ConstructTestServerURL(kTestURLTemplate2);
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), test_url2, NEW_FOREGROUND_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
   EXPECT_TRUE(
       content::ZoomValuesEqual(default_zoom_level, GetZoomLevel(test_url2)));
 
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
-  ui_zoom::PageZoom::Zoom(web_contents, content::PAGE_ZOOM_OUT);
+  zoom::PageZoom::Zoom(web_contents, content::PAGE_ZOOM_OUT);
   observer.BlockUntilZoomLevelForHostHasChanged(test_url2.host());
   EXPECT_FALSE(
       content::ZoomValuesEqual(default_zoom_level, GetZoomLevel(test_url2)));
 
-  ui_zoom::PageZoom::Zoom(web_contents, content::PAGE_ZOOM_IN);
+  zoom::PageZoom::Zoom(web_contents, content::PAGE_ZOOM_IN);
   observer.BlockUntilZoomLevelForHostHasChanged(test_url2.host());
   EXPECT_TRUE(
       content::ZoomValuesEqual(default_zoom_level, GetZoomLevel(test_url2)));
 
   // Now both tabs should be at the default zoom level, so there should not be
   // any per-host values saved either to Pref, or internally in HostZoomMap.
   EXPECT_TRUE(GetHostsWithZoomLevels().empty());
   EXPECT_TRUE(GetHostsWithZoomLevelsFromPrefs().empty());
 }
 
@@ skipping 94 matching lines @@
   ZoomLevelChangeObserver observer(browser()->profile());
 
   web_contents->SetPageScale(1.5);
   observer.BlockUntilZoomLevelForHostHasChanged(test_host);
   EXPECT_FALSE(content::HostZoomMap::PageScaleFactorIsOne(web_contents));
 
   web_contents->SetPageScale(1.f);
   observer.BlockUntilZoomLevelForHostHasChanged(test_host);
   EXPECT_TRUE(content::HostZoomMap::PageScaleFactorIsOne(web_contents));
 }