| Index: chrome/browser/plugins/plugin_info_message_filter.cc
|
| diff --git a/chrome/browser/plugins/plugin_info_message_filter.cc b/chrome/browser/plugins/plugin_info_message_filter.cc
|
| index bee46bea0234e0b155ac69059978fa6e2e2a16af..c650dda7fd7211f6a1fcd2c19d10532c8af456b8 100644
|
| --- a/chrome/browser/plugins/plugin_info_message_filter.cc
|
| +++ b/chrome/browser/plugins/plugin_info_message_filter.cc
|
| @@ -22,6 +22,7 @@
|
| #include "chrome/browser/plugins/plugin_finder.h"
|
| #include "chrome/browser/plugins/plugin_metadata.h"
|
| #include "chrome/browser/plugins/plugin_prefs.h"
|
| +#include "chrome/browser/plugins/plugins_field_trial.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/ui/browser_otr_state.h"
|
| #include "chrome/common/pref_names.h"
|
| @@ -29,7 +30,6 @@
|
| #include "components/component_updater/component_updater_service.h"
|
| #include "components/content_settings/core/browser/content_settings_utils.h"
|
| #include "components/content_settings/core/browser/host_content_settings_map.h"
|
| -#include "components/content_settings/core/browser/plugins_field_trial.h"
|
| #include "components/content_settings/core/common/content_settings.h"
|
| #include "components/prefs/pref_service.h"
|
| #include "components/rappor/rappor_service.h"
|
| @@ -322,7 +322,7 @@ void PluginInfoMessageFilter::Context::DecidePluginStatus(
|
|
|
| // TODO(tommycli): Remove once we deprecate the plugin ASK policy.
|
| bool legacy_ask_user = plugin_setting == CONTENT_SETTING_ASK;
|
| - plugin_setting = content_settings::PluginsFieldTrial::EffectiveContentSetting(
|
| + plugin_setting = PluginsFieldTrial::EffectiveContentSetting(
|
| CONTENT_SETTINGS_TYPE_PLUGINS, plugin_setting);
|
|
|
| DCHECK(plugin_setting != CONTENT_SETTING_DEFAULT);
|
|
|