Move ZoomObserver, ZoomController and ZoomEventManager to components/.

chrome/browser/ui/zoom/zoom_controller_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 "chrome/browser/ui/zoom/zoom_controller.h"
+#include "components/ui/zoom/zoom_controller.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/process/kill.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/zoom/chrome_zoom_level_prefs.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/page_type.h"
 #include "content/public/test/browser_test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
+using ui_zoom::ZoomController;
+using ui_zoom::ZoomObserver;
+
 bool operator==(const ZoomController::ZoomChangedEventData& lhs,
                 const ZoomController::ZoomChangedEventData& rhs) {
   return lhs.web_contents == rhs.web_contents &&
          lhs.old_zoom_level == rhs.old_zoom_level &&
          lhs.new_zoom_level == rhs.new_zoom_level &&
          lhs.zoom_mode == rhs.zoom_mode &&
          lhs.can_show_bubble == rhs.can_show_bubble;
 }
 
 class ZoomChangedWatcher : public ZoomObserver {
@@ skipping 17 matching lines @@
   }
 
  private:
   content::WebContents* web_contents_;
   ZoomController::ZoomChangedEventData expected_event_data_;
   scoped_refptr<content::MessageLoopRunner> message_loop_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(ZoomChangedWatcher);
 };
 
-class TestZoomObserver : public ZoomObserver {
- public:
-  MOCK_METHOD1(OnZoomChanged,
-               void(const ZoomController::ZoomChangedEventData&));
-};
-
-class ZoomControllerBrowserTest: public InProcessBrowserTest {
- protected:
-  TestZoomObserver zoom_observer_;
-};
+typedef InProcessBrowserTest ZoomControllerBrowserTest;
 
 #if defined(OS_ANDROID)
 #define MAYBE_CrashedTabsDoNotChangeZoom DISABLED_CrashedTabsDoNotChangeZoom
 #else
 #define MAYBE_CrashedTabsDoNotChangeZoom CrashedTabsDoNotChangeZoom
 #endif
 IN_PROC_BROWSER_TEST_F(ZoomControllerBrowserTest,
                        MAYBE_CrashedTabsDoNotChangeZoom) {
   // At the start of the test we are at a tab displaying about:blank.
   content::WebContents* web_contents =
@@ skipping 58 matching lines @@
 
   // The following attempt to change the zoom level for an error page should
   // fail.
   zoom_controller->SetZoomLevel(new_zoom_level);
   EXPECT_FLOAT_EQ(new_zoom_level, zoom_controller->GetZoomLevel());
 }
 
 IN_PROC_BROWSER_TEST_F(ZoomControllerBrowserTest, Observe) {
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
-  ZoomController* zoom_controller =
-      ZoomController::FromWebContents(web_contents);
-  zoom_controller->AddObserver(&zoom_observer_);
 
   double new_zoom_level = 1.0;
   // When the event is initiated from HostZoomMap, the old zoom level is not
   // available.
   ZoomController::ZoomChangedEventData zoom_change_data(
       web_contents,
       new_zoom_level,
       new_zoom_level,
       ZoomController::ZOOM_MODE_DEFAULT,
       true);  // We have a non-empty host, so this will be 'true'.
-  EXPECT_CALL(zoom_observer_, OnZoomChanged(zoom_change_data)).Times(1);
+  ZoomChangedWatcher zoom_change_watcher(web_contents, zoom_change_data);
 
   content::HostZoomMap* host_zoom_map =
       content::HostZoomMap::GetDefaultForBrowserContext(
           web_contents->GetBrowserContext());
 
   host_zoom_map->SetZoomLevelForHost("about:blank", new_zoom_level);
+  zoom_change_watcher.Wait();
 }