content/browser/frame_host/interstitial_page_impl_browsertest.cc - Issue 1212373009: Route 'Select All' OS method through RenderWidgetHostDelegate.

Unified Diff: content/browser/frame_host/interstitial_page_impl_browsertest.cc

Issue 1212373009: Route 'Select All' OS method through RenderWidgetHostDelegate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Move TearDownTestClipboard back to InterstitialPageImplTest.Paste Created 5 years, 5 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 | « content/browser/frame_host/interstitial_page_impl.cc ('k') | content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/frame_host/interstitial_page_impl_browsertest.cc

diff --git a/content/browser/frame_host/interstitial_page_impl_browsertest.cc b/content/browser/frame_host/interstitial_page_impl_browsertest.cc

index a1d69fdae3717173bef55721cd22cb77dedbb3d2..511eaea85569c6f5dfb50c6c15de086e2ced8a0a 100644

--- a/content/browser/frame_host/interstitial_page_impl_browsertest.cc

+++ b/content/browser/frame_host/interstitial_page_impl_browsertest.cc

@@ -31,21 +31,28 @@ class TestInterstitialPageDelegate : public InterstitialPageDelegate {

"<head>"

"<title>LOADED</title>"

"<script>"

+ "function create_input_and_set_text(text) {"

+ " var input = document.createElement('input');"

+ " input.id = 'input';"

+ " document.body.appendChild(input);"

+ " document.getElementById('input').value = text;"

+ " input.addEventListener('input',"

+ " function() { document.title='TEXT_CHANGED'; });"

+ "}"

"function focus_select_input() {"

" document.getElementById('input').select();"

"}"

- "function set_input_text(text) {"

- " document.getElementById('input').value = text;"

- "}"

"function get_input_text() {"

" window.domAutomationController.send("

" document.getElementById('input').value);"

"}"

+ "function get_selection() {"

+ " window.domAutomationController.send("

+ " window.getSelection().toString());"

+ "}"

"</script>"

"</head>"

- "<body>"

- " <input id='input' oninput='document.title=\"TEXT_CHANGED\"'>"

- "</body>"

+ "<body>original body text</body>"

"</html>";

}

};

@@ -263,9 +270,14 @@ class InterstitialPageImplTest : public ContentBrowserTest {

"get_input_text()", input_text);

}

- bool SetInputText(const std::string& text) {

+ bool GetSelection(std::string* input_text) {

+ return ExecuteScriptAndExtractString(interstitial_->GetMainFrame(),

+ "get_selection()", input_text);

+ }

+ bool CreateInputAndSetText(const std::string& text) {

return ExecuteScript(interstitial_->GetMainFrame(),

- "set_input_text('" + text + "')");

+ "create_input_and_set_text('" + text + "')");

}

std::string PerformCut() {

@@ -296,6 +308,12 @@ class InterstitialPageImplTest : public ContentBrowserTest {

title_update_watcher_->Wait();

}

+ void PerformSelectAll() {

+ RenderFrameHostImpl* rfh =

+ static_cast<RenderFrameHostImpl*>(interstitial_->GetMainFrame());

+ rfh->GetRenderWidgetHost()->delegate()->SelectAll();

+ }

private:

void RunTaskOnIOThreadAndWait(const base::Closure& task) {

base::WaitableEvent completion(false, false);

@@ -320,7 +338,7 @@ class InterstitialPageImplTest : public ContentBrowserTest {

IN_PROC_BROWSER_TEST_F(InterstitialPageImplTest, Cut) {

SetUpInterstitialPage();

- ASSERT_TRUE(SetInputText("text-to-cut"));

+ ASSERT_TRUE(CreateInputAndSetText("text-to-cut"));

ASSERT_TRUE(FocusInputAndSelectText());

std::string clipboard_text = PerformCut();

@@ -336,7 +354,7 @@ IN_PROC_BROWSER_TEST_F(InterstitialPageImplTest, Cut) {

IN_PROC_BROWSER_TEST_F(InterstitialPageImplTest, Copy) {

SetUpInterstitialPage();

- ASSERT_TRUE(SetInputText("text-to-copy"));

+ ASSERT_TRUE(CreateInputAndSetText("text-to-copy"));

ASSERT_TRUE(FocusInputAndSelectText());

std::string clipboard_text = PerformCopy();

@@ -355,7 +373,7 @@ IN_PROC_BROWSER_TEST_F(InterstitialPageImplTest, Paste) {

SetClipboardText("text-to-paste");

- ASSERT_TRUE(SetInputText(std::string()));

+ ASSERT_TRUE(CreateInputAndSetText(std::string()));

ASSERT_TRUE(FocusInputAndSelectText());

PerformPaste();

@@ -368,4 +386,18 @@ IN_PROC_BROWSER_TEST_F(InterstitialPageImplTest, Paste) {

TearDownTestClipboard();

}

+IN_PROC_BROWSER_TEST_F(InterstitialPageImplTest, SelectAll) {

+ SetUpInterstitialPage();

+ std::string input_text;

+ ASSERT_TRUE(GetSelection(&input_text));

+ EXPECT_EQ(std::string(), input_text);

+ PerformSelectAll();

+ ASSERT_TRUE(GetSelection(&input_text));

+ EXPECT_EQ("original body text", input_text);

+ TearDownInterstitialPage();

} // namespace content