Disable zoom bubble for PDF extension.

chrome/browser/pdf/pdf_extension_test.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 <vector>
 
 #include "base/base_paths.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_util.h"
 #include "base/hash.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/component_loader.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/pdf/pdf_extension_test_util.h"
 #include "chrome/browser/pdf/pdf_extension_util.h"
 #include "chrome/browser/plugins/plugin_prefs.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/views/location_bar/zoom_bubble_view.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/ui/zoom/page_zoom.h"
+#include "components/ui/zoom/test/zoom_test_utils.h"
 #include "components/ui/zoom/zoom_controller.h"
-#include "components/ui/zoom/zoom_test_utils.h"
 #include "content/public/browser/browser_plugin_guest_manager.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/manifest_handlers/mime_types_handler.h"
 #include "extensions/test/result_catcher.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "url/gurl.h"
 
+#if defined(TOOLKIT_VIEWS)

[Lei Zhang, 2015/10/29 16:40:33]

I'd do this for now: #if defined(TOOLKIT_VIEWS) && !defined(OS_MACOSX) 

+#include "chrome/browser/ui/views/location_bar/zoom_bubble_view.h"
+#endif
+
 const int kNumberLoadTestParts = 10;
 
 bool GetGuestCallback(content::WebContents** guest_out,
                       content::WebContents* guest) {
   EXPECT_FALSE(*guest_out);
   *guest_out = guest;
   // Return false so that we iterate through all the guests and verify there is
   // only one.
   return false;
 }
@@ skipping 350 matching lines @@
   GURL unfiltered_valid_link_url(valid_link_url);
   content::RenderProcessHost* rph = guest_contents->GetRenderProcessHost();
   rph->FilterURL(true, &valid_link_url);
   rph->FilterURL(true, &invalid_link_url);
 
   // Invalid link URLs should be changed to "about:blank" when filtered.
   EXPECT_EQ(unfiltered_valid_link_url, valid_link_url);
   EXPECT_EQ(GURL("about:blank"), invalid_link_url);
 }
 
-#if !defined(OS_MACOSX)
 IN_PROC_BROWSER_TEST_F(PDFExtensionTest, PdfZoomWithoutBubble) {
   using namespace ui_zoom;
 
   GURL test_pdf_url(embedded_test_server()->GetURL("/pdf/test.pdf"));
   content::WebContents* guest_contents = LoadPdfGetGuestContents(test_pdf_url);
   ASSERT_TRUE(guest_contents);
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
 
   // The PDF viewer always starts at default zoom, which for tests is 100% or
   // zoom level 0.0. Here we look at the presets to find the next zoom level
   // above 0. Ideally we should look at the zoom levels from the PDF viewer
   // javascript, but we assume they'll always match the browser presets, which
   // are easier to access.
   std::vector<double> preset_zoom_levels = PageZoom::PresetZoomLevels(0.0);
   std::vector<double>::iterator it =
-      find(preset_zoom_levels.begin(), preset_zoom_levels.end(), 0.0);
+      std::find(preset_zoom_levels.begin(), preset_zoom_levels.end(), 0.0);
   ASSERT_TRUE(it != preset_zoom_levels.end());
   it++;
   ASSERT_TRUE(it != preset_zoom_levels.end());
   double new_zoom_level = *it;
 
   auto zoom_controller = ZoomController::FromWebContents(web_contents);
+  // We expect a ZoomChangedEvent with can_show_bubble == false if the PDF
+  // extension behaviour is properly picked up. The test times out otherwise.
   ZoomChangedWatcher watcher(zoom_controller,
                              ZoomController::ZoomChangedEventData(
                                  web_contents, 0.f, new_zoom_level,
-                                 ZoomController::ZOOM_MODE_MANUAL, true));
+                                 ZoomController::ZOOM_MODE_MANUAL, false));
 
   // Zoom PDF via script.
+#if defined(TOOLKIT_VIEWS)
   EXPECT_EQ(nullptr, ZoomBubbleView::GetZoomBubble());
+#endif
   ASSERT_TRUE(
       content::ExecuteScript(guest_contents, "viewer.viewport.zoomIn();"));
 
   watcher.Wait();
+#if defined(TOOLKIT_VIEWS)
   EXPECT_EQ(nullptr, ZoomBubbleView::GetZoomBubble());
+#endif
 }
-#endif
 
 class MaterialPDFExtensionTest : public PDFExtensionTest {
   void SetUpCommandLine(base::CommandLine* command_line) override {
     command_line->AppendSwitch(switches::kEnablePdfMaterialUI);
   }
 };
 
 IN_PROC_BROWSER_TEST_F(MaterialPDFExtensionTest, Basic) {
   RunTestsInFile("basic_test_material.js", "test.pdf");
 }
@@ skipping 36 matching lines @@
   RunTestsInFile("title_test.js", "test-title.pdf");
 }
 
 IN_PROC_BROWSER_TEST_F(MaterialPDFExtensionTest, WhitespaceTitle) {
   RunTestsInFile("whitespace_title_test.js", "test-whitespace-title.pdf");
 }
 
 IN_PROC_BROWSER_TEST_F(MaterialPDFExtensionTest, PageChange) {
   RunTestsInFile("page_change_test.js", "test-bookmarks.pdf");
 }