[HBD] Map ASK to DETECT_IMPORTANT_CONTENT when PreferHtmlOverPlugins is enabled

chrome/browser/ui/website_settings/website_settings_ui.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
 
 #include "base/macros.h"
+#include "chrome/browser/plugins/plugins_field_trial.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
-#include "components/content_settings/core/browser/plugins_field_trial.h"
 #include "components/strings/grit/components_strings.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 
 namespace {
 
 const int kInvalidResourceID = -1;
 
@@ skipping 198 matching lines @@
     ContentSettingsType type,
     ContentSetting setting,
     ContentSetting default_setting,
     content_settings::SettingSource source) {
   ContentSetting effective_setting = setting;
   if (effective_setting == CONTENT_SETTING_DEFAULT)
     effective_setting = default_setting;
 
 #if defined(ENABLE_PLUGINS)
   effective_setting =
-      content_settings::PluginsFieldTrial::EffectiveContentSetting(
+      PluginsFieldTrial::EffectiveContentSetting(

[Lei Zhang, 2016/08/22 17:57:54]

Fits on previous line? Just git cl format?

[trizzofo, 2016/08/22 18:09:36]

Done.

           type, effective_setting);
 #endif
 
   const int* button_text_ids = NULL;
   switch (source) {
     case content_settings::SETTING_SOURCE_USER:
       if (setting == CONTENT_SETTING_DEFAULT)
         button_text_ids = kPermissionButtonTextIDDefaultSetting;
       else
         button_text_ids = kPermissionButtonTextIDUserManaged;
@@ skipping 125 matching lines @@
   }
   return resource_id;
 }
 
 // static
 const gfx::Image& WebsiteSettingsUI::GetConnectionIcon(
     WebsiteSettings::SiteConnectionStatus status) {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   return rb.GetNativeImageNamed(GetConnectionIconID(status));
 }