Cleanup: Use plugin constants in more places.
Review URL: https://chromiumcodereview.appspot.com/10990078
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159133 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/chrome_plugin_browsertest.cc b/chrome/browser/chrome_plugin_browsertest.cc
index 44a369c..7b2e689 100644
--- a/chrome/browser/chrome_plugin_browsertest.cc
+++ b/chrome/browser/chrome_plugin_browsertest.cc
@@ -20,6 +20,7 @@
#include "content/public/test/browser_test_utils.h"
#include "content/public/test/test_utils.h"
#include "net/base/net_util.h"
+#include "webkit/plugins/plugin_constants.h"
#include "webkit/plugins/webplugininfo.h"
using content::BrowserThread;
@@ -61,7 +62,7 @@
std::vector<webkit::WebPluginInfo> plugins = GetPlugins();
for (std::vector<webkit::WebPluginInfo>::const_iterator it =
plugins.begin(); it != plugins.end(); ++it) {
- if (it->name == ASCIIToUTF16("Shockwave Flash"))
+ if (it->name == ASCIIToUTF16(kFlashPluginName))
return it->path;
}
return FilePath();
diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc
index 13bb08d..95850279 100644
--- a/chrome/browser/policy/policy_browsertest.cc
+++ b/chrome/browser/policy/policy_browsertest.cc
@@ -37,7 +37,6 @@
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/prefs/session_startup_pref.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/net/url_request_mock_util.h"
#include "chrome/browser/search_engines/template_url.h"
#include "chrome/browser/search_engines/template_url_service.h"
#include "chrome/browser/search_engines/template_url_service_factory.h"
@@ -94,6 +93,7 @@
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
#include "webkit/plugins/npapi/plugin_utils.h"
+#include "webkit/plugins/plugin_constants.h"
#include "webkit/plugins/webplugininfo.h"
#if defined(OS_CHROMEOS)
@@ -265,7 +265,7 @@
const std::vector<webkit::WebPluginInfo>& plugins) {
const webkit::WebPluginInfo* flash = NULL;
for (size_t i = 0; i < plugins.size(); ++i) {
- if (plugins[i].name == ASCIIToUTF16("Shockwave Flash")) {
+ if (plugins[i].name == ASCIIToUTF16(kFlashPluginName)) {
flash = &plugins[i];
break;
}
@@ -780,7 +780,7 @@
EXPECT_TRUE(SetPluginEnabled(plugin_prefs, flash, false));
EXPECT_FALSE(plugin_prefs->IsPluginEnabled(*flash));
base::ListValue plugin_list;
- plugin_list.Append(base::Value::CreateStringValue("Shockwave Flash"));
+ plugin_list.Append(base::Value::CreateStringValue(kFlashPluginName));
PolicyMap policies;
policies.Set(key::kEnabledPlugins, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, plugin_list.DeepCopy());
diff --git a/chrome/browser/ui/webui/flash_ui.cc b/chrome/browser/ui/webui/flash_ui.cc
index 9463d47..90200ec 100644
--- a/chrome/browser/ui/webui/flash_ui.cc
+++ b/chrome/browser/ui/webui/flash_ui.cc
@@ -41,6 +41,7 @@
#include "grit/theme_resources.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
+#include "webkit/plugins/plugin_constants.h"
#include "webkit/plugins/webplugininfo.h"
#if defined(OS_WIN)
@@ -55,6 +56,8 @@
namespace {
+const char kFlashPlugin[] = "Flash plugin";
+
ChromeWebUIDataSource* CreateFlashUIHTMLSource() {
ChromeWebUIDataSource* source =
new ChromeWebUIDataSource(chrome::kChromeUIFlashHost);
@@ -267,10 +270,10 @@
// Obtain the version of the Flash plugins.
std::vector<webkit::WebPluginInfo> info_array;
PluginService::GetInstance()->GetPluginInfoArray(
- GURL(), "application/x-shockwave-flash", false, &info_array, NULL);
+ GURL(), kFlashPluginSwfMimeType, false, &info_array, NULL);
string16 flash_version;
if (info_array.empty()) {
- AddPair(list, ASCIIToUTF16("Flash plugin"), "Disabled");
+ AddPair(list, ASCIIToUTF16(kFlashPlugin), "Disabled");
} else {
PluginPrefs* plugin_prefs =
PluginPrefs::GetForProfile(Profile::FromWebUI(web_ui()));
@@ -280,7 +283,7 @@
info_array[i].path.LossyDisplayName();
if (i != 0)
flash_version += ASCIIToUTF16(" (not used)");
- AddPair(list, ASCIIToUTF16("Flash plugin"), flash_version);
+ AddPair(list, ASCIIToUTF16(kFlashPlugin), flash_version);
}
}
}
diff --git a/chrome/browser/ui/webui/version_handler.cc b/chrome/browser/ui/webui/version_handler.cc
index 73988d7..55c50f3 100644
--- a/chrome/browser/ui/webui/version_handler.cc
+++ b/chrome/browser/ui/webui/version_handler.cc
@@ -18,6 +18,7 @@
#include "googleurl/src/gurl.h"
#include "grit/generated_resources.h"
#include "ui/base/l10n/l10n_util.h"
+#include "webkit/plugins/plugin_constants.h"
namespace {
@@ -132,7 +133,7 @@
// Obtain the version of the first enabled Flash plugin.
std::vector<webkit::WebPluginInfo> info_array;
content::PluginService::GetInstance()->GetPluginInfoArray(
- GURL(), "application/x-shockwave-flash", false, &info_array, NULL);
+ GURL(), kFlashPluginSwfMimeType, false, &info_array, NULL);
string16 flash_version =
l10n_util::GetStringUTF16(IDS_PLUGINS_DISABLED_PLUGIN);
PluginPrefs* plugin_prefs =
diff --git a/chrome/renderer/plugins/plugin_placeholder.cc b/chrome/renderer/plugins/plugin_placeholder.cc
index ad839b6..e46e9e463 100644
--- a/chrome/renderer/plugins/plugin_placeholder.cc
+++ b/chrome/renderer/plugins/plugin_placeholder.cc
@@ -44,6 +44,10 @@
#include "webkit/plugins/npapi/plugin_list.h"
#include "webkit/plugins/webview_plugin.h"
+#if defined(ENABLE_MOBILE_YOUTUBE_PLUGIN)
+#include "webkit/plugins/plugin_constants.h"
+#endif
+
using content::RenderThread;
using content::RenderView;
using WebKit::WebContextMenuData;
@@ -630,6 +634,6 @@
EndsWith(host, "youtube-nocookie.com", true);
return is_youtube && IsValidYouTubeVideo(url.path()) &&
- LowerCaseEqualsASCII(mime_type, "application/x-shockwave-flash");
+ LowerCaseEqualsASCII(mime_type, kFlashPluginSwfMimeType);
}
#endif
diff --git a/content/browser/plugin_data_remover_impl.cc b/content/browser/plugin_data_remover_impl.cc
index 030ba4db..08b9aff1 100644
--- a/content/browser/plugin_data_remover_impl.cc
+++ b/content/browser/plugin_data_remover_impl.cc
@@ -4,6 +4,8 @@
#include "content/browser/plugin_data_remover_impl.h"
+#include <limits>
+
#include "base/bind.h"
#include "base/metrics/histogram.h"
#include "base/sequenced_task_runner_helpers.h"
@@ -20,12 +22,12 @@
#include "content/public/common/pepper_plugin_info.h"
#include "ppapi/proxy/ppapi_messages.h"
#include "webkit/plugins/npapi/plugin_utils.h"
+#include "webkit/plugins/plugin_constants.h"
namespace content {
namespace {
-const char kFlashMimeType[] = "application/x-shockwave-flash";
// The minimum Flash Player version that implements NPP_ClearSiteData.
const char kMinFlashVersion[] = "10.3";
const int64 kRemovalTimeoutMs = 10000;
@@ -44,7 +46,7 @@
bool allow_wildcard = false;
std::vector<webkit::WebPluginInfo> plugins;
PluginService::GetInstance()->GetPluginInfoArray(
- GURL(), kFlashMimeType, allow_wildcard, &plugins, NULL);
+ GURL(), kFlashPluginSwfMimeType, allow_wildcard, &plugins, NULL);
Version min_version(kMinFlashVersion);
for (std::vector<webkit::WebPluginInfo>::iterator it = plugins.begin();
it != plugins.end(); ++it) {
@@ -293,7 +295,7 @@
PluginDataRemoverImpl::PluginDataRemoverImpl(BrowserContext* browser_context)
- : mime_type_(kFlashMimeType),
+ : mime_type_(kFlashPluginSwfMimeType),
browser_context_(browser_context) {
}
diff --git a/content/renderer/webplugin_delegate_proxy.cc b/content/renderer/webplugin_delegate_proxy.cc
index b9f42b7..e76d4215 100644
--- a/content/renderer/webplugin_delegate_proxy.cc
+++ b/content/renderer/webplugin_delegate_proxy.cc
@@ -76,7 +76,7 @@
class ScopedLogLevel {
public:
- ScopedLogLevel(int level);
+ explicit ScopedLogLevel(int level);
~ScopedLogLevel();
private:
@@ -382,8 +382,7 @@
params.arg_values = arg_values;
params.host_render_view_routing_id = render_view_->routing_id();
- bool flash =
- LowerCaseEqualsASCII(mime_type_, "application/x-shockwave-flash");
+ bool flash = LowerCaseEqualsASCII(mime_type_, kFlashPluginSwfMimeType);
bool silverlight =
StartsWithASCII(mime_type_, "application/x-silverlight", false);
for (size_t i = 0; i < arg_names.size(); ++i) {
