Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4491)

Unified Diff: chrome/browser/download/save_page_browsertest.cc

Issue 1373573002: ABANDONED: OOPIFs: Moving stitching of local paths from renderer to browser process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@page-serialization-recursive-begone
Patch Set: Rebasing... Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/browser/DEPS » ('j') | content/browser/download/save_package.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/download/save_page_browsertest.cc
diff --git a/chrome/browser/download/save_page_browsertest.cc b/chrome/browser/download/save_page_browsertest.cc
index 67ba540264c7f25e972b1f065888092133f07788..fc8b148010bc63ff0041ae7771ef017473225d69 100644
--- a/chrome/browser/download/save_page_browsertest.cc
+++ b/chrome/browser/download/save_page_browsertest.cc
@@ -804,13 +804,7 @@ class SavePageSitePerProcessBrowserTest : public SavePageBrowserTest {
protected:
void SetUpCommandLine(base::CommandLine* command_line) override {
SavePageBrowserTest::SetUpCommandLine(command_line);
-
- // TODO(lukasza): Enable --site-per-process once crbug.com/526786 is fixed.
- // (currently, when the line below is uncommented out, the test crashes
- // under blink::WebLocalFrameImpl::fromFrameOwnerElement called from
- // blink::WebPageSerializerImpl::openTagToString).
- //
- // content::IsolateAllSitesForTesting(command_line);
+ content::IsolateAllSitesForTesting(command_line);
}
void SetUpOnMainThread() override {
@@ -828,12 +822,6 @@ class SavePageSitePerProcessBrowserTest : public SavePageBrowserTest {
// Test for crbug.com/526786. Without OOPIFs fixes, the test will trigger
// a crash in the renderer process.
IN_PROC_BROWSER_TEST_F(SavePageSitePerProcessBrowserTest, SaveCrossSitePage) {
- // TODO(lukasza): Remove this check once crbug.com/526786 is fixed.
- if (content::AreAllSitesIsolatedForTesting()) {
- LOG(WARNING) << "Skipping the test.";
- return; // Avoid failing on Site Isolation FYI bot.
- }
-
GURL url(embedded_test_server()->GetURL("a.com", "/save_page/iframes.htm"));
ui_test_utils::NavigateToURL(browser(), url);
@@ -865,11 +853,10 @@ IN_PROC_BROWSER_TEST_F(SavePageSitePerProcessBrowserTest, SaveCrossSitePage) {
std::string main_contents;
ASSERT_TRUE(base::ReadFileToString(full_file_name, &main_contents));
EXPECT_THAT(main_contents,
- HasSubstr("<iframe src=\"./iframes_files/a.html\"></iframe>"));
- EXPECT_THAT(main_contents,
- HasSubstr("<iframe src=\"./iframes_files/b.html\"></iframe>"));
+ HasSubstr("<iframe src=\"iframes_files/a.html\"></iframe>"));
EXPECT_THAT(main_contents,
- HasSubstr("<img src=\"./iframes_files/1.png\">"));
+ HasSubstr("<iframe src=\"iframes_files/b.html\"></iframe>"));
+ EXPECT_THAT(main_contents, HasSubstr("<img src=\"iframes_files/1.png\">"));
}
} // namespace
« no previous file with comments | « no previous file | content/browser/DEPS » ('j') | content/browser/download/save_package.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698