Chromium Code Reviews| Index: chrome/browser/chrome_site_per_process_browsertest.cc |
| diff --git a/chrome/browser/chrome_site_per_process_browsertest.cc b/chrome/browser/chrome_site_per_process_browsertest.cc |
| index ddc1cd23221f5b398baaad5d8712199b7c2ab789..5912e3517ad7f78d5f786485da522040c1c73600 100644 |
| --- a/chrome/browser/chrome_site_per_process_browsertest.cc |
| +++ b/chrome/browser/chrome_site_per_process_browsertest.cc |
| @@ -8,10 +8,13 @@ |
| #include "base/path_service.h" |
| #include "base/strings/stringprintf.h" |
| #include "chrome/browser/chrome_notification_types.h" |
| +#include "chrome/browser/profiles/profile.h" |
| #include "chrome/browser/ui/browser.h" |
| #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| #include "chrome/test/base/in_process_browser_test.h" |
| #include "chrome/test/base/ui_test_utils.h" |
| +#include "components/guest_view/browser/guest_view_manager_delegate.h" |
| +#include "components/guest_view/browser/test_guest_view_manager.h" |
| #include "content/public/browser/interstitial_page.h" |
| #include "content/public/browser/notification_observer.h" |
| #include "content/public/browser/notification_service.h" |
| @@ -22,6 +25,7 @@ |
| #include "content/public/test/browser_test_utils.h" |
| #include "content/public/test/content_browser_test_utils.h" |
| #include "content/public/test/test_utils.h" |
| +#include "extensions/browser/api/extensions_api_client.h" |
| #include "net/dns/mock_host_resolver.h" |
| #include "net/test/embedded_test_server/embedded_test_server.h" |
| #include "ui/display/display_switches.h" |
| @@ -249,3 +253,63 @@ IN_PROC_BROWSER_TEST_F(ChromeSitePerProcessTest, PopupWindowFocus) { |
| // The popup should be focused now. |
| EXPECT_EQ(popup, browser()->tab_strip_model()->GetActiveWebContents()); |
| } |
| + |
| +class ChromeSitePerProcessPDFTest : public ChromeSitePerProcessTest { |
| + public: |
| + ChromeSitePerProcessPDFTest() |
| + : factory_(new guest_view::TestGuestViewManagerFactory()) {} |
| + ~ChromeSitePerProcessPDFTest() override {} |
| + |
| + void SetUpOnMainThread() override { |
| + ChromeSitePerProcessTest::SetUpOnMainThread(); |
| + guest_view::GuestViewManager::set_factory_for_testing(factory_.get()); |
| + } |
| + |
| + guest_view::TestGuestViewManager* GetGuestViewManager() { |
| + guest_view::TestGuestViewManager* manager = |
| + static_cast<guest_view::TestGuestViewManager*>( |
| + guest_view::TestGuestViewManager::FromBrowserContext( |
| + browser()->profile())); |
| + // TestGuestViewManager::WaitForSingleGuestCreated may and will get called |
| + // before a guest is created. |
| + if (!manager) { |
| + manager = static_cast<guest_view::TestGuestViewManager*>( |
| + guest_view::GuestViewManager::CreateWithDelegate( |
| + browser()->profile(), |
| + extensions::ExtensionsAPIClient::Get() |
| + ->CreateGuestViewManagerDelegate(browser()->profile()))); |
| + } |
| + return manager; |
| + } |
| + |
| + private: |
| + std::unique_ptr<guest_view::TestGuestViewManagerFactory> factory_; |
| + |
| + DISALLOW_COPY_AND_ASSIGN(ChromeSitePerProcessPDFTest); |
| +}; |
| + |
| +// This test verifies that when navigating an OOPIF to a page with <embed>-ed |
| +// PDF, the guest is properly created. |
| +IN_PROC_BROWSER_TEST_F(ChromeSitePerProcessPDFTest, |
| + EmbeddedPDFInsideCrossOriginFrame) { |
| + // Navigate to a page with an <iframe>. |
| + GURL main_url(embedded_test_server()->GetURL("a.com", "/iframe.html")); |
| + ui_test_utils::NavigateToURL(browser(), main_url); |
| + |
| + guest_view::TestGuestViewManager* guest_view_manager = GetGuestViewManager(); |
| + |
| + // Initially, no guests are created. |
| + EXPECT_EQ(0U, guest_view_manager->num_guests_created()); |
| + |
| + // Navigate subframe to a page with an embedded PDF. |
|
Charlie Reis
2016/10/18 22:52:20
nit: to a cross-site page with
EhsanK
2016/10/20 21:41:17
Done.
|
| + content::WebContents* active_web_contents = |
| + browser()->tab_strip_model()->GetActiveWebContents(); |
| + GURL frame_url = |
| + embedded_test_server()->GetURL("b.com", "/page_with_embedded_pdf.html"); |
| + |
| + // Ensure the page finishes loading without crashing. |
| + EXPECT_TRUE(NavigateIframeToURL(active_web_contents, "test", frame_url)); |
| + |
| + // Wait until the guest for PDF is created. |
| + guest_view_manager->WaitForNumGuestsCreated(1U); |
| +} |