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

Unified Diff: chrome/browser/plugins/plugin_prefs_unittest.cc

Issue 19518006: Remove the two years old code to enable the nacl plugin once if it's disabled. This was added to de… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 5 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
Index: chrome/browser/plugins/plugin_prefs_unittest.cc
===================================================================
--- chrome/browser/plugins/plugin_prefs_unittest.cc (revision 212045)
+++ chrome/browser/plugins/plugin_prefs_unittest.cc (working copy)
@@ -185,7 +185,6 @@
webkit::npapi::MockPluginList plugin_list;
PluginService::GetInstance()->SetPluginListForTesting(&plugin_list);
PluginService::GetInstance()->Init();
- plugin_prefs_->SetPluginListForTesting(&plugin_list);
string16 component_updated_plugin_name(
ASCIIToUTF16("Component-updated Pepper Flash"));
@@ -251,6 +250,5 @@
EXPECT_FALSE(plugin_prefs_->IsPluginEnabled(component_updated_plugin_2));
EXPECT_TRUE(plugin_prefs_->IsPluginEnabled(bundled_plugin));
- plugin_prefs_->SetPluginListForTesting(NULL);
PluginService::GetInstance()->SetPluginListForTesting(NULL);
}

Powered by Google App Engine
This is Rietveld 408576698