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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1162373002: Make some editing/selection functions accessible to c/b/renderer_host/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Simplified wait implementations Created 5 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 | « content/browser/frame_host/interstitial_page_impl.cc ('k') | content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc » ('j') | content/common/clipboard_messages.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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
new file mode 100644
index 0000000000000000000000000000000000000000..216e14ae55b77cc8eee30acdd45659e294519ed8
--- /dev/null
+++ b/content/browser/frame_host/interstitial_page_impl_browsertest.cc
@@ -0,0 +1,373 @@
+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "content/browser/frame_host/interstitial_page_impl.h"
+
+#include "base/auto_reset.h"
dcheng 2015/07/02 07:06:25 This is no longer needed.
mohsen 2015/07/02 16:41:01 Thanks for catching this. Removed.
+#include "base/strings/utf_string_conversions.h"
+#include "base/synchronization/waitable_event.h"
+#include "content/browser/web_contents/web_contents_impl.h"
+#include "content/common/clipboard_messages.h"
+#include "content/common/frame_messages.h"
+#include "content/public/browser/browser_message_filter.h"
+#include "content/public/browser/interstitial_page_delegate.h"
+#include "content/public/test/browser_test_utils.h"
+#include "content/public/test/content_browser_test.h"
+#include "content/public/test/test_utils.h"
+#include "content/shell/browser/shell.h"
+#include "ipc/message_filter.h"
+#include "ui/base/clipboard/scoped_clipboard_writer.h"
+#include "ui/base/test/test_clipboard.h"
+
+namespace content {
+
+namespace {
+
+class TestInterstitialPageDelegate : public InterstitialPageDelegate {
+ private:
+ // InterstitialPageDelegate:
+ std::string GetHTMLContents() override {
+ return "<html>"
+ "<head>"
+ "<title>LOADED</title>"
+ "<script>"
+ "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);"
+ "}"
+ "</script>"
+ "</head>"
+ "<body>"
+ " <input id='input' oninput='document.title=\"TEXT_CHANGED\"'>"
+ "</body>"
+ "</html>";
+ }
+};
+
+// A title watcher for interstitial pages. The existing TitleWatcher does not
+// work for interstitial pages. Note that this title watcher waits for the
+// title update IPC message not the actual title update. So, the new title is
+// probably not propagated completely, yet.
+class InterstitialTitleUpdateWatcher : public BrowserMessageFilter {
+ public:
+ explicit InterstitialTitleUpdateWatcher(InterstitialPage* interstitial)
+ : BrowserMessageFilter(FrameMsgStart) {
+ interstitial->GetMainFrame()->GetProcess()->AddFilter(this);
+ }
+
+ void InitWait(const std::string& expected_title) {
+ DCHECK(!run_loop_);
+ expected_title_ = base::ASCIIToUTF16(expected_title);
dcheng 2015/07/02 07:06:25 Nit: UTF8ToUTF16 is probably a bit more future pro
mohsen 2015/07/02 16:41:01 Done.
+ run_loop_.reset(new base::RunLoop());
+ }
+
+ void Wait() {
+ DCHECK(run_loop_);
+ run_loop_->Run();
+ run_loop_.reset();
+ }
+
+ private:
+ ~InterstitialTitleUpdateWatcher() override {}
+
+ void OnTitleUpdateReceived(const base::string16& title) {
+ DCHECK(run_loop_);
+ if (title == expected_title_)
+ run_loop_->Quit();
+ }
+
+ // BrowserMessageFilter:
+ bool OnMessageReceived(const IPC::Message& message) override {
+ if (!run_loop_)
+ return false;
+
+ if (message.type() == FrameHostMsg_UpdateTitle::ID) {
+ FrameHostMsg_UpdateTitle::Param params;
+ if (FrameHostMsg_UpdateTitle::Read(&message, &params)) {
+ BrowserThread::PostTask(
+ BrowserThread::UI, FROM_HERE,
+ base::Bind(&InterstitialTitleUpdateWatcher::OnTitleUpdateReceived,
+ this, base::get<0>(params)));
+ }
+ }
+ return false;
+ }
+
+ base::string16 expected_title_;
+ scoped_ptr<base::RunLoop> run_loop_;
+
+ DISALLOW_COPY_AND_ASSIGN(InterstitialTitleUpdateWatcher);
+};
+
+// A message filter that watches for WriteText and CommitWrite clipboard IPC
+// messages to make sure cut/copy is working properly. It will mark these events
+// as handled to prevent modification of the actual clipboard.
+class ClipboardMessageWatcher : public IPC::MessageFilter {
+ public:
+ explicit ClipboardMessageWatcher(InterstitialPage* interstitial) {
+ interstitial->GetMainFrame()->GetProcess()->GetChannel()->AddFilter(this);
+ }
+
+ void InitWait() {
+ DCHECK(!run_loop_);
+ run_loop_.reset(new base::RunLoop());
+ }
+
+ void WaitForWriteCommit() {
+ DCHECK(run_loop_);
+ run_loop_->Run();
+ run_loop_.reset();
+ }
+
+ const base::string16& last_text() const { return last_text_; }
+
+ private:
+ ~ClipboardMessageWatcher() override {}
+
+ void OnWriteText(const base::string16& text) { last_text_ = text; }
+
+ void OnCommitWrite() {
+ DCHECK(run_loop_);
+ run_loop_->Quit();
+ }
+
+ // IPC::MessageFilter:
+ bool OnMessageReceived(const IPC::Message& message) override {
+ if (!run_loop_)
+ return false;
+
+ if (message.type() == ClipboardHostMsg_WriteText::ID) {
+ ClipboardHostMsg_WriteText::Param params;
+ if (ClipboardHostMsg_WriteText::Read(&message, &params)) {
+ BrowserThread::PostTask(
+ BrowserThread::UI, FROM_HERE,
+ base::Bind(&ClipboardMessageWatcher::OnWriteText, this,
+ base::get<1>(params)));
+ }
+ return true;
+ }
+ if (message.type() == ClipboardHostMsg_CommitWrite::ID) {
+ BrowserThread::PostTask(
+ BrowserThread::UI, FROM_HERE,
+ base::Bind(&ClipboardMessageWatcher::OnCommitWrite, this));
+ return true;
+ }
+ return false;
+ }
+
+ scoped_ptr<base::RunLoop> run_loop_;
+ base::string16 last_text_;
+
+ DISALLOW_COPY_AND_ASSIGN(ClipboardMessageWatcher);
+};
+
+} // namespace
+
+class InterstitialPageImplTest : public ContentBrowserTest {
+ public:
+ InterstitialPageImplTest()
+ : clipboard_message_watcher_(nullptr), title_update_watcher_(nullptr) {}
+
+ ~InterstitialPageImplTest() override {}
+
+ protected:
+ void SetUpTestClipboard() {
+#if defined(OS_WIN)
+ // On Windows, clipboard reads are handled on the IO thread. So, the test
+ // clipboard should be created for the IO thread.
+ if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) {
+ RunTaskOnIOThreadAndWait(
+ base::Bind(&InterstitialPageImplTest::SetUpTestClipboard, this));
+ return;
+ }
+#endif
+ ui::TestClipboard::CreateForCurrentThread();
+ }
+
+ void TearDownTestClipboard() {
+#if defined(OS_WIN)
+ // On Windows, test clipboard is created for the IO thread. So, destroy it
+ // for the IO thread, too.
+ if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) {
+ RunTaskOnIOThreadAndWait(
+ base::Bind(&InterstitialPageImplTest::TearDownTestClipboard, this));
+ return;
+ }
+#endif
+ ui::Clipboard::DestroyClipboardForCurrentThread();
+ }
+
+ void SetClipboardText(const std::string& text) {
+#if defined(OS_WIN)
+ // On Windows, clipboard reads are handled on the IO thread. So, set the
+ // text for the IO thread clipboard.
+ if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) {
+ RunTaskOnIOThreadAndWait(
+ base::Bind(&InterstitialPageImplTest::SetClipboardText, this, text));
+ return;
+ }
+#endif
+ ui::ScopedClipboardWriter clipboard_writer(ui::CLIPBOARD_TYPE_COPY_PASTE);
+ clipboard_writer.WriteText(base::ASCIIToUTF16(text));
+ }
+
+ void SetUpInterstitialPage() {
+ WebContentsImpl* web_contents =
+ static_cast<WebContentsImpl*>(shell()->web_contents());
+
+ // Create the interstitial page.
+ TestInterstitialPageDelegate* interstitial_delegate =
+ new TestInterstitialPageDelegate;
+ GURL url("http://interstitial");
+ interstitial_.reset(new InterstitialPageImpl(
+ web_contents, static_cast<RenderWidgetHostDelegate*>(web_contents),
+ true, url, interstitial_delegate));
+ interstitial_->Show();
+ WaitForInterstitialAttach(web_contents);
+
+ // Focus the interstitial frame
+ FrameTree* frame_tree = static_cast<RenderViewHostDelegate*>(
+ interstitial_.get())->GetFrameTree();
+ frame_tree->SetFocusedFrame(frame_tree->root());
+
+ clipboard_message_watcher_ =
+ new ClipboardMessageWatcher(interstitial_.get());
+ title_update_watcher_ =
+ new InterstitialTitleUpdateWatcher(interstitial_.get());
dcheng 2015/07/02 07:06:25 These are leaked right now. Will the bots complain
mohsen 2015/07/02 16:41:01 My understanding is that these are ref-counted and
dcheng 2015/07/02 16:53:28 I suppose that's right, but it wasn't obvious to m
mohsen 2015/07/02 17:03:45 Commented this in code.
mohsen 2015/07/02 17:04:53 I mean documented...
+
+ // Wait until page loads completely.
+ if (web_contents->GetTitle() != base::ASCIIToUTF16("LOADED")) {
+ title_update_watcher_->InitWait("LOADED");
+ title_update_watcher_->Wait();
+ }
+ }
+
+ void TearDownInterstitialPage() {
+ // Close the interstitial.
+ interstitial_->DontProceed();
+ WaitForInterstitialDetach(shell()->web_contents());
+ interstitial_.reset();
+ }
+
+ bool FocusInputAndSelectText() {
+ return ExecuteScript(interstitial_->GetMainFrame(), "focus_select_input()");
+ }
+
+ bool GetInputText(std::string* input_text) {
+ return ExecuteScriptAndExtractString(interstitial_->GetMainFrame(),
+ "get_input_text()", input_text);
+ }
+
+ bool SetInputText(const std::string& text) {
+ return ExecuteScript(interstitial_->GetMainFrame(),
+ "set_input_text('" + text + "')");
+ }
+
+ base::string16 PerformCut() {
+ clipboard_message_watcher_->InitWait();
+ title_update_watcher_->InitWait("TEXT_CHANGED");
+ RenderFrameHostImpl* rfh =
+ static_cast<RenderFrameHostImpl*>(interstitial_->GetMainFrame());
+ rfh->GetRenderWidgetHost()->delegate()->Cut();
+ clipboard_message_watcher_->WaitForWriteCommit();
+ title_update_watcher_->Wait();
+ return clipboard_message_watcher_->last_text();
+ }
+
+ base::string16 PerformCopy() {
+ clipboard_message_watcher_->InitWait();
+ RenderFrameHostImpl* rfh =
+ static_cast<RenderFrameHostImpl*>(interstitial_->GetMainFrame());
+ rfh->GetRenderWidgetHost()->delegate()->Copy();
+ clipboard_message_watcher_->WaitForWriteCommit();
+ return clipboard_message_watcher_->last_text();
+ }
+
+ void PerformPaste() {
+ title_update_watcher_->InitWait("TEXT_CHANGED");
+ RenderFrameHostImpl* rfh =
+ static_cast<RenderFrameHostImpl*>(interstitial_->GetMainFrame());
+ rfh->GetRenderWidgetHost()->delegate()->Paste();
+ title_update_watcher_->Wait();
+ }
+
+ private:
+ void RunTaskOnIOThreadAndWait(const base::Closure& task) {
+ base::WaitableEvent completion(false, false);
+ BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
+ base::Bind(&InterstitialPageImplTest::RunTask, this,
+ task, &completion));
+ completion.Wait();
+ }
+
+ void RunTask(const base::Closure& task, base::WaitableEvent* completion) {
+ task.Run();
+ completion->Signal();
+ }
+
+ scoped_ptr<InterstitialPageImpl> interstitial_;
+ ClipboardMessageWatcher* clipboard_message_watcher_;
+ InterstitialTitleUpdateWatcher* title_update_watcher_;
+
+ DISALLOW_COPY_AND_ASSIGN(InterstitialPageImplTest);
+};
+
+IN_PROC_BROWSER_TEST_F(InterstitialPageImplTest, Cut) {
+ SetUpInterstitialPage();
+
+ ASSERT_TRUE(SetInputText("text-to-cut"));
+ ASSERT_TRUE(FocusInputAndSelectText());
+
+ base::string16 clipboard_text = PerformCut();
dcheng 2015/07/02 07:06:25 I'd recommend having the helpers convert to std::s
mohsen 2015/07/02 16:41:01 Done.
+ EXPECT_EQ(base::ASCIIToUTF16("text-to-cut"), clipboard_text);
+
+ std::string input_text;
+ ASSERT_TRUE(GetInputText(&input_text));
+ EXPECT_EQ(std::string(), input_text);
+
+ TearDownInterstitialPage();
+}
+
+IN_PROC_BROWSER_TEST_F(InterstitialPageImplTest, Copy) {
+ SetUpInterstitialPage();
+
+ ASSERT_TRUE(SetInputText("text-to-copy"));
+ ASSERT_TRUE(FocusInputAndSelectText());
+
+ base::string16 clipboard_text = PerformCopy();
+ EXPECT_EQ(base::ASCIIToUTF16("text-to-copy"), clipboard_text);
+
+ std::string input_text;
+ ASSERT_TRUE(GetInputText(&input_text));
+ EXPECT_EQ("text-to-copy", input_text);
+
+ TearDownInterstitialPage();
+}
+
+IN_PROC_BROWSER_TEST_F(InterstitialPageImplTest, Paste) {
+ SetUpTestClipboard();
+ SetUpInterstitialPage();
+
+ SetClipboardText("text-to-paste");
+
+ ASSERT_TRUE(SetInputText(std::string()));
+ ASSERT_TRUE(FocusInputAndSelectText());
+
+ PerformPaste();
+
+ std::string input_text;
+ ASSERT_TRUE(GetInputText(&input_text));
+ EXPECT_EQ("text-to-paste", input_text);
+
+ TearDownInterstitialPage();
+ TearDownTestClipboard();
+}
+
+} // namespace content
« 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') | content/common/clipboard_messages.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698