| 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 b7a4f74ec19dc3b95bb086b433c7a808dd0b63f4..ccadca9650b8c4e0fd1fd595be0ee43ca0cffeee 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"
|
| @@ -288,3 +292,54 @@ IN_PROC_BROWSER_TEST_F(ChromeSitePerProcessTest,
|
| GURL expected_url(embedded_test_server()->GetURL("c.com", "/title1.html"));
|
| EXPECT_EQ(expected_url, new_contents->GetLastCommittedURL());
|
| }
|
| +
|
| +class ChromeSitePerProcessPDFTest : public ChromeSitePerProcessTest {
|
| + public:
|
| + ChromeSitePerProcessPDFTest() : test_guest_view_manager_(nullptr) {}
|
| + ~ChromeSitePerProcessPDFTest() override {}
|
| +
|
| + void SetUpOnMainThread() override {
|
| + ChromeSitePerProcessTest::SetUpOnMainThread();
|
| + guest_view::GuestViewManager::set_factory_for_testing(&factory_);
|
| + test_guest_view_manager_ = static_cast<guest_view::TestGuestViewManager*>(
|
| + guest_view::GuestViewManager::CreateWithDelegate(
|
| + browser()->profile(),
|
| + extensions::ExtensionsAPIClient::Get()
|
| + ->CreateGuestViewManagerDelegate(browser()->profile())));
|
| + }
|
| +
|
| + protected:
|
| + guest_view::TestGuestViewManager* test_guest_view_manager() const {
|
| + return test_guest_view_manager_;
|
| + }
|
| +
|
| + private:
|
| + guest_view::TestGuestViewManagerFactory factory_;
|
| + guest_view::TestGuestViewManager* test_guest_view_manager_;
|
| +
|
| + 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 (https://crbug.com/649856).
|
| +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);
|
| +
|
| + // Initially, no guests are created.
|
| + EXPECT_EQ(0U, test_guest_view_manager()->num_guests_created());
|
| +
|
| + // Navigate subframe to a cross-site page with an embedded PDF.
|
| + 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.
|
| + test_guest_view_manager()->WaitForSingleGuestCreated();
|
| +}
|
|
|