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

Unified Diff: chrome/browser/plugins/plugin_info_message_filter_unittest.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
Index: chrome/browser/plugins/plugin_info_message_filter_unittest.cc
diff --git a/chrome/browser/plugins/plugin_info_message_filter_unittest.cc b/chrome/browser/plugins/plugin_info_message_filter_unittest.cc
index 59bd2ba2f1f55aa8a3a94701161db1f131c92097..a1cf28a0aa6266fba765ccec55612acd50f96987 100644
--- a/chrome/browser/plugins/plugin_info_message_filter_unittest.cc
+++ b/chrome/browser/plugins/plugin_info_message_filter_unittest.cc
@@ -64,7 +64,7 @@ bool FakePluginServiceFilter::IsPluginAvailable(
std::map<base::FilePath, bool>::iterator it =
plugin_state_.find(plugin->path);
if (it == plugin_state_.end()) {
- ADD_FAILURE() << "No plug-in state for '" << plugin->path.value() << "'";
+ ADD_FAILURE() << "No plugin state for '" << plugin->path.value() << "'";
return false;
}
return it->second;
@@ -86,10 +86,10 @@ class PluginInfoMessageFilterTest : public ::testing::Test {
}
void SetUp() override {
- content::WebPluginInfo foo_plugin(base::ASCIIToUTF16("Foo Plug-in"),
+ content::WebPluginInfo foo_plugin(base::ASCIIToUTF16("Foo Plugin"),
foo_plugin_path_,
base::ASCIIToUTF16("1"),
- base::ASCIIToUTF16("The Foo plug-in."));
+ base::ASCIIToUTF16("The Foo plugin."));
content::WebPluginMimeType mime_type;
mime_type.mime_type = "foo/bar";
foo_plugin.mime_types.push_back(mime_type);
@@ -97,10 +97,10 @@ class PluginInfoMessageFilterTest : public ::testing::Test {
PluginService::GetInstance()->Init();
PluginService::GetInstance()->RegisterInternalPlugin(foo_plugin, false);
- content::WebPluginInfo bar_plugin(base::ASCIIToUTF16("Bar Plug-in"),
+ content::WebPluginInfo bar_plugin(base::ASCIIToUTF16("Bar Plugin"),
bar_plugin_path_,
base::ASCIIToUTF16("1"),
- base::ASCIIToUTF16("The Bar plug-in."));
+ base::ASCIIToUTF16("The Bar plugin."));
mime_type.mime_type = "foo/bar";
bar_plugin.mime_types.push_back(mime_type);
bar_plugin.type = content::WebPluginInfo::PLUGIN_TYPE_PEPPER_IN_PROCESS;
« no previous file with comments | « chrome/browser/plugins/plugin_info_message_filter.cc ('k') | chrome/browser/plugins/plugin_infobar_delegates.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698