summaryrefslogtreecommitdiffstats
path: root/chrome/test/automation
diff options
context:
space:
mode:
authorbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-25 12:28:22 +0000
committerbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-25 12:28:22 +0000
commit4da06efd6d467e07ac311a59e5f79bd0cc6145d4 (patch)
tree711d378acbaa00035c56f2f6af82f09e3a301d71 /chrome/test/automation
parent506398ae0dcffa9677ba4c08fd27ce4cf141426d (diff)
downloadchromium_src-4da06efd6d467e07ac311a59e5f79bd0cc6145d4.zip
chromium_src-4da06efd6d467e07ac311a59e5f79bd0cc6145d4.tar.gz
chromium_src-4da06efd6d467e07ac311a59e5f79bd0cc6145d4.tar.bz2
Add UI test for click-to-play.
BUG=57277 TEST=NPAPIVisiblePluginTester.ClickToPlay:ClickToPlayPluginTest.* Review URL: http://codereview.chromium.org/3539002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63722 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/automation')
-rw-r--r--chrome/test/automation/automation_messages_internal.h5
-rw-r--r--chrome/test/automation/tab_proxy.cc9
-rw-r--r--chrome/test/automation/tab_proxy.h3
3 files changed, 17 insertions, 0 deletions
diff --git a/chrome/test/automation/automation_messages_internal.h b/chrome/test/automation/automation_messages_internal.h
index 537067f..adadf68 100644
--- a/chrome/test/automation/automation_messages_internal.h
+++ b/chrome/test/automation/automation_messages_internal.h
@@ -1441,4 +1441,9 @@ IPC_BEGIN_MESSAGES(Automation)
int /* autocomplete edit handle */,
bool /* success */)
+ // Loads all blocked plug-ins on the page.
+ IPC_SYNC_MESSAGE_ROUTED1_1(AutomationMsg_LoadBlockedPlugins,
+ int /* tab handle */,
+ bool /* success */)
+
IPC_END_MESSAGES(Automation)
diff --git a/chrome/test/automation/tab_proxy.cc b/chrome/test/automation/tab_proxy.cc
index d0d0426..a338de7 100644
--- a/chrome/test/automation/tab_proxy.cc
+++ b/chrome/test/automation/tab_proxy.cc
@@ -729,6 +729,15 @@ bool TabProxy::OverrideEncoding(const std::string& encoding) {
return succeeded;
}
+bool TabProxy::LoadBlockedPlugins() {
+ if (!is_valid())
+ return false;
+
+ bool succeeded = false;
+ sender_->Send(new AutomationMsg_LoadBlockedPlugins(0, handle_, &succeeded));
+ return succeeded;
+}
+
#if defined(OS_WIN)
void TabProxy::Reposition(HWND window, HWND window_insert_after, int left,
int top, int width, int height, int flags,
diff --git a/chrome/test/automation/tab_proxy.h b/chrome/test/automation/tab_proxy.h
index 4efbb86..92a80a7 100644
--- a/chrome/test/automation/tab_proxy.h
+++ b/chrome/test/automation/tab_proxy.h
@@ -375,6 +375,9 @@ class TabProxy : public AutomationResourceProxy,
// Uses the specified encoding to override encoding of the page in the tab.
bool OverrideEncoding(const std::string& encoding) WARN_UNUSED_RESULT;
+ // Loads all blocked plug-ins on the page.
+ bool LoadBlockedPlugins() WARN_UNUSED_RESULT;
+
#if defined(OS_WIN)
// Resizes the tab window.
// The parent_window parameter allows a parent to be specified for the window