diff options
author | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-07 18:57:08 +0000 |
---|---|---|
committer | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-07 18:57:08 +0000 |
commit | e21486fa346521c9f129642605229199cb031944 (patch) | |
tree | c3500b9150c1fdede72bf187f97fa287ad971b85 /chrome/common/automation_messages_internal.h | |
parent | dab9d65ae623ae9978c898aae916780e30162c1a (diff) | |
download | chromium_src-e21486fa346521c9f129642605229199cb031944.zip chromium_src-e21486fa346521c9f129642605229199cb031944.tar.gz chromium_src-e21486fa346521c9f129642605229199cb031944.tar.bz2 |
Revert 135661 - Move the click-to-play tests from plugin_test to browser_test. Then I'm planning on getting rid of plugin_tests (it's huge since it links in chrome, most of the tests are disabled, and we can put them in browser_tests and only work if the plugin is installed).
broke ClickToPlayPluginTest.LoadAllBlockedPlugins:
http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Tests%20%282%29/builds/1458/steps/browser_tests/logs/stdio
I made the click to play test use our test plugin instead of Flash so that it can run on all machines.
BUG=121574,113057
TBR=darin
Review URL: http://codereview.chromium.org/10380011
TBR=jam@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10384039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135685 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/automation_messages_internal.h')
-rw-r--r-- | chrome/common/automation_messages_internal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/common/automation_messages_internal.h b/chrome/common/automation_messages_internal.h index d1847e6..83e2f7f 100644 --- a/chrome/common/automation_messages_internal.h +++ b/chrome/common/automation_messages_internal.h @@ -1423,7 +1423,7 @@ IPC_SYNC_MESSAGE_CONTROL1_1(AutomationMsg_DEPRECATED_WaitForAutocompleteEditFocu bool /* success */) // Loads all blocked plug-ins on the page. -IPC_SYNC_MESSAGE_CONTROL1_1(AutomationMsg_DEPRECATED_LoadBlockedPlugins, +IPC_SYNC_MESSAGE_CONTROL1_1(AutomationMsg_LoadBlockedPlugins, int /* tab handle */, bool /* success */) |