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

Unified Diff: chrome/browser/extensions/plugin_apitest.cc

Issue 1007443004: Plugin Power Saver: Replace all "plug-in" with "plugin" for consistency. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove terms and native_client_sdk changes. Created 5 years, 9 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
« no previous file with comments | « chrome/browser/download/download_target_info.h ('k') | chrome/browser/extensions/plugin_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/plugin_apitest.cc
diff --git a/chrome/browser/extensions/plugin_apitest.cc b/chrome/browser/extensions/plugin_apitest.cc
index 02f03f31df148d3a73745708c374c80853247fbb..c6fc2c156a46f58061f3c9b4476db1d30d71ba0a 100644
--- a/chrome/browser/extensions/plugin_apitest.cc
+++ b/chrome/browser/extensions/plugin_apitest.cc
@@ -166,15 +166,15 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MAYBE_PluginPrivate) {
#if defined(OS_CHROMEOS)
EXPECT_FALSE(result);
#else
- // TODO(bauerb): This might wrongly fail if the plug-in takes too long
- // to load. Extension-private plug-ins don't appear in navigator.plugins, so
- // we can't check for the plug-in in Javascript.
+ // TODO(bauerb): This might wrongly fail if the plugin takes too long
+ // to load. Extension-private plugins don't appear in navigator.plugins, so
+ // we can't check for the plugin in Javascript.
EXPECT_TRUE(result);
#endif
- // Regression test for http://crbug.com/131811: The plug-in should be
+ // Regression test for http://crbug.com/131811: The plugin should be
// whitelisted for the extension (and only for the extension), so it should be
- // loaded even if content settings are set to block plug-ins.
+ // loaded even if content settings are set to block plugins.
browser()->profile()->GetHostContentSettingsMap()->SetDefaultContentSetting(
CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_BLOCK);
ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
« no previous file with comments | « chrome/browser/download/download_target_info.h ('k') | chrome/browser/extensions/plugin_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698