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

chrome/browser/ui/browser_unittest.cc

 // Copyright 2013 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 "chrome/browser/ui/browser.h"
 
 #include "base/macros.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/ui/browser_command_controller.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
-#include "components/ui/zoom/zoom_controller.h"
+#include "components/zoom/zoom_controller.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/web_contents_tester.h"
 
 using content::SiteInstance;
 using content::WebContents;
 using content::WebContentsTester;
 
 class BrowserUnitTest : public BrowserWithTestWindowTest {
  public:
@@ skipping 64 matching lines @@
   EXPECT_FALSE(chrome::CanPrint(browser()));
 }
 
 // Ensure the zoom-in and zoom-out commands get disabled when a tab crashes.
 TEST_F(BrowserUnitTest, DisableZoomOnCrashedTab) {
   TabStripModel* tab_strip_model = browser()->tab_strip_model();
 
   WebContents* contents = CreateTestWebContents();
   tab_strip_model->AppendWebContents(contents, true);
   WebContentsTester::For(contents)->NavigateAndCommit(GURL("about:blank"));
-  ui_zoom::ZoomController* zoom_controller =
-    ui_zoom::ZoomController::FromWebContents(contents);
+  zoom::ZoomController* zoom_controller =
+      zoom::ZoomController::FromWebContents(contents);
   EXPECT_TRUE(zoom_controller->SetZoomLevel(zoom_controller->
                                             GetDefaultZoomLevel()));
 
   CommandUpdater* command_updater =
       browser()->command_controller()->command_updater();
 
   EXPECT_TRUE(zoom_controller->IsAtDefaultZoom());
   EXPECT_FALSE(contents->IsCrashed());
   EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_ZOOM_PLUS));
   EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_ZOOM_MINUS));
@@ skipping 108 matching lines @@
   // Activate the 1st tab which is NTP.
   browser()->tab_strip_model()->ActivateTabAt(0, true);
   EXPECT_EQ(BookmarkBar::SHOW, browser()->bookmark_bar_state());
   EXPECT_EQ(BookmarkBar::SHOW, window_bookmark_bar_state());
 
   // Activate the 2nd tab which is non-NTP.
   browser()->tab_strip_model()->ActivateTabAt(1, true);
   EXPECT_EQ(BookmarkBar::SHOW, browser()->bookmark_bar_state());
   EXPECT_EQ(BookmarkBar::SHOW, window_bookmark_bar_state());
 }