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

Unified Diff: content/browser/site_per_process_browsertest.cc

Issue 2100503002: Fix file input dialog from out-of-process iframe. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix nit. Created 4 years, 6 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/renderer/render_frame_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/site_per_process_browsertest.cc
diff --git a/content/browser/site_per_process_browsertest.cc b/content/browser/site_per_process_browsertest.cc
index e6cbd495eece2c87763d2ecb2e2f9c274164178e..242c0ecd167577af615d09c8a2b9d038e33b3dd8 100644
--- a/content/browser/site_per_process_browsertest.cc
+++ b/content/browser/site_per_process_browsertest.cc
@@ -13,6 +13,7 @@
#include "base/command_line.h"
#include "base/location.h"
#include "base/macros.h"
+#include "base/path_service.h"
#include "base/single_thread_task_runner.h"
#include "base/strings/pattern.h"
#include "base/strings/stringprintf.h"
@@ -7299,4 +7300,36 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, AllowFullscreen) {
EXPECT_TRUE(is_fullscreen_allowed(root->child_at(0)->child_at(0)));
}
+// Test for https://crbug.com/615575. It ensures that file chooser triggered
+// by a document in an out-of-process subframe works properly.
+IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, FileChooserInSubframe) {
+ EXPECT_TRUE(NavigateToURL(shell(), embedded_test_server()->GetURL(
+ "a.com", "/cross_site_iframe_factory.html?a(b)")));
+ FrameTreeNode* root = web_contents()->GetFrameTree()->root();
+
+ GURL url(embedded_test_server()->GetURL("b.com", "/file_input.html"));
+ NavigateFrameToURL(root->child_at(0), url);
+
+ // Use FileChooserDelegate to avoid showing the actual dialog and to respond
+ // back to the renderer process with predefined file.
+ base::FilePath file;
+ EXPECT_TRUE(PathService::Get(base::DIR_TEMP, &file));
+ file = file.AppendASCII("bar");
+ std::unique_ptr<FileChooserDelegate> delegate(new FileChooserDelegate(file));
+ shell()->web_contents()->SetDelegate(delegate.get());
+ EXPECT_TRUE(ExecuteScript(root->child_at(0),
+ "document.getElementById('fileinput').click();"));
+ EXPECT_TRUE(delegate->file_chosen());
+
+ // Also, extract the file from the renderer process to ensure that the
+ // response made it over successfully and the proper filename is set.
+ std::string file_name;
+ EXPECT_TRUE(ExecuteScriptAndExtractString(
+ root->child_at(0),
+ "window.domAutomationController.send("
+ "document.getElementById('fileinput').files[0].name);",
+ &file_name));
+ EXPECT_EQ("bar", file_name);
+}
+
} // namespace content
« no previous file with comments | « no previous file | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698