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).

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

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=135661
Review URL: https://chromiumcodereview.appspot.com/10380011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136820 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 18 deletions

diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
index dc3d02f..1f85942 100644
--- a/chrome/browser/automation/testing_automation_provider.cc
+++ b/chrome/browser/automation/testing_automation_provider.cc
@@ -506,7 +506,6 @@ bool TestingAutomationProvider::OnMessageReceived(
     IPC_MESSAGE_HANDLER(AutomationMsg_ShutdownSessionService,
                         ShutdownSessionService)
     IPC_MESSAGE_HANDLER(AutomationMsg_SetContentSetting, SetContentSetting)
-    IPC_MESSAGE_HANDLER(AutomationMsg_LoadBlockedPlugins, LoadBlockedPlugins)
     IPC_MESSAGE_HANDLER(AutomationMsg_ResetToDefaultTheme, ResetToDefaultTheme)
     IPC_MESSAGE_HANDLER_DELAY_REPLY(
         AutomationMsg_WaitForProcessLauncherThreadToGoIdle,
@@ -7120,23 +7119,6 @@ void TestingAutomationProvider::SetContentSetting(
   }
 }
 
-void TestingAutomationProvider::LoadBlockedPlugins(int tab_handle,
-                                                   bool* success) {
-  *success = false;
-  if (tab_tracker_->ContainsHandle(tab_handle)) {
-    NavigationController* nav = tab_tracker_->GetResource(tab_handle);
-    if (!nav)
-      return;
-    WebContents* contents = nav->GetWebContents();
-    if (!contents)
-      return;
-    RenderViewHost* host = contents->GetRenderViewHost();
-    host->Send(new ChromeViewMsg_LoadBlockedPlugins(host->GetRoutingID(),
-                                                    std::string()));
-    *success = true;
-  }
-}
-
 void TestingAutomationProvider::ResetToDefaultTheme() {
   ThemeServiceFactory::GetForProfile(profile_)->UseDefaultTheme();
 }