| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/files/file_path.h" | 6 #include "base/files/file_path.h" |
| 7 #include "base/macros.h" | 7 #include "base/macros.h" |
| 8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
| 9 #include "base/strings/stringprintf.h" | 9 #include "base/strings/stringprintf.h" |
| 10 #include "chrome/browser/chrome_notification_types.h" | 10 #include "chrome/browser/chrome_notification_types.h" |
| (...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 313 return test_guest_view_manager_; | 313 return test_guest_view_manager_; |
| 314 } | 314 } |
| 315 | 315 |
| 316 private: | 316 private: |
| 317 guest_view::TestGuestViewManagerFactory factory_; | 317 guest_view::TestGuestViewManagerFactory factory_; |
| 318 guest_view::TestGuestViewManager* test_guest_view_manager_; | 318 guest_view::TestGuestViewManager* test_guest_view_manager_; |
| 319 | 319 |
| 320 DISALLOW_COPY_AND_ASSIGN(ChromeSitePerProcessPDFTest); | 320 DISALLOW_COPY_AND_ASSIGN(ChromeSitePerProcessPDFTest); |
| 321 }; | 321 }; |
| 322 | 322 |
| 323 // TODO(ekaramad): This test is flaky on Windows 7. Enable it when the issue is |
| 324 // fixed ((https://crbug.com/666379). |
| 325 #if defined(OS_WIN) |
| 326 #define MAYBE_EmbeddedPDFInsideCrossOriginFrame \ |
| 327 DISABLED_EmbeddedPDFInsideCrossOriginFrame |
| 328 #else |
| 329 #define MAYBE_EmbeddedPDFInsideCrossOriginFrame \ |
| 330 EmbeddedPDFInsideCrossOriginFrame |
| 331 #endif |
| 323 // This test verifies that when navigating an OOPIF to a page with <embed>-ed | 332 // This test verifies that when navigating an OOPIF to a page with <embed>-ed |
| 324 // PDF, the guest is properly created (https://crbug.com/649856). | 333 // PDF, the guest is properly created (https://crbug.com/649856). |
| 325 IN_PROC_BROWSER_TEST_F(ChromeSitePerProcessPDFTest, | 334 IN_PROC_BROWSER_TEST_F(ChromeSitePerProcessPDFTest, |
| 326 EmbeddedPDFInsideCrossOriginFrame) { | 335 MAYBE_EmbeddedPDFInsideCrossOriginFrame) { |
| 327 // Navigate to a page with an <iframe>. | 336 // Navigate to a page with an <iframe>. |
| 328 GURL main_url(embedded_test_server()->GetURL("a.com", "/iframe.html")); | 337 GURL main_url(embedded_test_server()->GetURL("a.com", "/iframe.html")); |
| 329 ui_test_utils::NavigateToURL(browser(), main_url); | 338 ui_test_utils::NavigateToURL(browser(), main_url); |
| 330 | 339 |
| 331 // Initially, no guests are created. | 340 // Initially, no guests are created. |
| 332 EXPECT_EQ(0U, test_guest_view_manager()->num_guests_created()); | 341 EXPECT_EQ(0U, test_guest_view_manager()->num_guests_created()); |
| 333 | 342 |
| 334 // Navigate subframe to a cross-site page with an embedded PDF. | 343 // Navigate subframe to a cross-site page with an embedded PDF. |
| 335 content::WebContents* active_web_contents = | 344 content::WebContents* active_web_contents = |
| 336 browser()->tab_strip_model()->GetActiveWebContents(); | 345 browser()->tab_strip_model()->GetActiveWebContents(); |
| 337 GURL frame_url = | 346 GURL frame_url = |
| 338 embedded_test_server()->GetURL("b.com", "/page_with_embedded_pdf.html"); | 347 embedded_test_server()->GetURL("b.com", "/page_with_embedded_pdf.html"); |
| 339 | 348 |
| 340 // Ensure the page finishes loading without crashing. | 349 // Ensure the page finishes loading without crashing. |
| 341 EXPECT_TRUE(NavigateIframeToURL(active_web_contents, "test", frame_url)); | 350 EXPECT_TRUE(NavigateIframeToURL(active_web_contents, "test", frame_url)); |
| 342 | 351 |
| 343 // Wait until the guest for PDF is created. | 352 // Wait until the guest for PDF is created. |
| 344 test_guest_view_manager()->WaitForSingleGuestCreated(); | 353 test_guest_view_manager()->WaitForSingleGuestCreated(); |
| 345 } | 354 } |
| OLD | NEW |