Disable zoom bubble for PDF extension.

chrome/browser/ui/zoom/zoom_controller_unittest.cc

Index: chrome/browser/ui/zoom/zoom_controller_unittest.cc
diff --git a/chrome/browser/ui/zoom/zoom_controller_unittest.cc b/chrome/browser/ui/zoom/zoom_controller_unittest.cc
index 105d4f29aeaf18bd430106e8453acc92d1f583f0..a03c58c13c7c50d1d68f3ab74aa374694350586d 100644
--- a/chrome/browser/ui/zoom/zoom_controller_unittest.cc
+++ b/chrome/browser/ui/zoom/zoom_controller_unittest.cc
@@ -10,6 +10,7 @@
 #include "chrome/test/base/testing_profile.h"
 #include "components/ui/zoom/zoom_controller.h"
 #include "components/ui/zoom/zoom_observer.h"
+#include "components/ui/zoom/zoom_test_utils.h"
 #include "content/public/browser/host_zoom_map.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/common/frame_navigate_params.h"
@@ -20,43 +21,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ui_zoom::ZoomController;
-
-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 ui_zoom::ZoomObserver {
- public:
-  ZoomChangedWatcher(
-      ZoomController* zoom_controller,
-      const ZoomController::ZoomChangedEventData& expected_event_data)
-      : zoom_controller_(zoom_controller),
-        expected_event_data_(expected_event_data),
-        message_loop_runner_(new content::MessageLoopRunner) {
-    zoom_controller_->AddObserver(this);
-  }
-  ~ZoomChangedWatcher() override { zoom_controller_->RemoveObserver(this); }
-
-  void Wait() { message_loop_runner_->Run(); }
-
-  void OnZoomChanged(
-      const ZoomController::ZoomChangedEventData& event_data) override {
-    if (event_data == expected_event_data_)
-      message_loop_runner_->Quit();
-  }
-
- private:
-  ZoomController* zoom_controller_;
-  ZoomController::ZoomChangedEventData expected_event_data_;
-  scoped_refptr<content::MessageLoopRunner> message_loop_runner_;
-
-  DISALLOW_COPY_AND_ASSIGN(ZoomChangedWatcher);
-};
+using ui_zoom::ZoomChangedWatcher;

[Lei Zhang, 2015/10/23 18:14:32]

Change before Control

[wjmaclean, 2015/10/29 15:33:36]

Done.

 
 class ZoomControllerTest : public ChromeRenderViewHostTestHarness {
  public: