| Index: chrome/browser/chrome_plugin_browsertest.cc
|
| diff --git a/chrome/browser/chrome_plugin_browsertest.cc b/chrome/browser/chrome_plugin_browsertest.cc
|
| index a119fb03a8955dd26b62782a0869660d95ca33bb..95f1bda61ff16dd33884a9623d638477d920b360 100644
|
| --- a/chrome/browser/chrome_plugin_browsertest.cc
|
| +++ b/chrome/browser/chrome_plugin_browsertest.cc
|
| @@ -137,24 +137,6 @@ class ChromePluginTest : public InProcessBrowserTest {
|
| return plugins;
|
| }
|
|
|
| - static void EnableFlash(bool enable, Profile* profile) {
|
| - std::vector<base::FilePath> paths;
|
| - GetFlashPath(&paths);
|
| - ASSERT_FALSE(paths.empty());
|
| -
|
| - PluginPrefs* plugin_prefs = PluginPrefs::GetForProfile(profile).get();
|
| - scoped_refptr<content::MessageLoopRunner> runner =
|
| - new content::MessageLoopRunner;
|
| - scoped_refptr<CallbackBarrier> callback_barrier(
|
| - new CallbackBarrier(runner->QuitClosure()));
|
| - for (std::vector<base::FilePath>::iterator iter = paths.begin();
|
| - iter != paths.end(); ++iter) {
|
| - plugin_prefs->EnablePlugin(enable, *iter,
|
| - callback_barrier->CreateCallback());
|
| - }
|
| - runner->Run();
|
| - }
|
| -
|
| static void EnsureFlashProcessCount(int expected) {
|
| int actual = 0;
|
| scoped_refptr<content::MessageLoopRunner> runner =
|
| @@ -232,18 +214,6 @@ IN_PROC_BROWSER_TEST_F(ChromePluginTest, DISABLED_Flash) {
|
|
|
| ASSERT_NO_FATAL_FAILURE(LoadAndWait(browser(), url, true));
|
| EnsureFlashProcessCount(1);
|
| -
|
| - // Now try disabling it.
|
| - EnableFlash(false, profile);
|
| - CrashFlash();
|
| -
|
| - ASSERT_NO_FATAL_FAILURE(LoadAndWait(browser(), url, false));
|
| - EnsureFlashProcessCount(0);
|
| -
|
| - // Now enable it again.
|
| - EnableFlash(true, profile);
|
| - ASSERT_NO_FATAL_FAILURE(LoadAndWait(browser(), url, true));
|
| - EnsureFlashProcessCount(1);
|
| }
|
|
|
| #if defined(OFFICIAL_BUILD)
|
|
|