Replace kPreferHtmlOverPlugins feature checks with PluginUtils::ShouldPreferHtmlOverPlugi…

chrome/browser/ui/views/website_settings/permission_prompt_impl.cc

 // Copyright 2014 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/views/website_settings/permission_prompt_impl.h"
 
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 46 matching lines @@
 // TODO(gbillock): refactor PermissionMenuButton to work like this and re-use?
 class PermissionCombobox : public views::MenuButton,
                            public views::MenuButtonListener {
  public:
   // Get notifications when the selection changes.
   class Listener {
    public:
     virtual void PermissionSelectionChanged(int index, bool allowed) = 0;
   };
 
-  PermissionCombobox(Listener* listener,
+  PermissionCombobox(Profile* profile,
+                     Listener* listener,
                      int index,
                      const GURL& url,
                      ContentSetting setting);
   ~PermissionCombobox() override;
 
   int index() const { return index_; }
 
   void GetAccessibleState(ui::AXViewState* state) override;
 
   // MenuButtonListener:
   void OnMenuButtonClicked(views::MenuButton* source,
                            const gfx::Point& point,
                            const ui::Event* event) override;
 
   // Callback when a permission's setting is changed.
   void PermissionChanged(const WebsiteSettingsUI::PermissionInfo& permission);
 
  private:
   int index_;
   Listener* listener_;
   std::unique_ptr<PermissionMenuModel> model_;
   std::unique_ptr<views::MenuRunner> menu_runner_;
 };
 
-PermissionCombobox::PermissionCombobox(Listener* listener,
+PermissionCombobox::PermissionCombobox(Profile* profile,
+                                       Listener* listener,
                                        int index,
                                        const GURL& url,
                                        ContentSetting setting)
     : MenuButton(base::string16(), this, true),
       index_(index),
       listener_(listener),
       model_(new PermissionMenuModel(
+          profile,
           url,
           setting,
           base::Bind(&PermissionCombobox::PermissionChanged,
                      base::Unretained(this)))) {
   SetText(model_->GetLabelAt(model_->GetIndexOfCommandId(setting)));
   SizeToPreferredSize();
 }
 
 PermissionCombobox::~PermissionCombobox() {}
 
@@ skipping 128 matching lines @@
         new views::Label(requests.at(index)->GetMessageTextFragment());
     label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     label_container->AddChildView(label);
     row_layout->AddView(label_container);
 
     // Only show the toggle if every request wants to show it.
     show_persistence_toggle = show_persistence_toggle &&
                               requests[index]->ShouldShowPersistenceToggle();
     if (requests.size() > 1) {
       PermissionCombobox* combobox = new PermissionCombobox(
-          this, index, requests[index]->GetOrigin(),
+          owner->GetProfile(), this, index, requests[index]->GetOrigin(),
           accept_state[index] ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK);
       row_layout->AddView(combobox);
       customize_comboboxes_.push_back(combobox);
     } else {
       row_layout->AddView(new views::View());
     }
 
     AddChildView(row);
   }
 
@@ skipping 217 matching lines @@
 
 void PermissionPromptImpl::Accept() {
   if (delegate_)
     delegate_->Accept();
 }
 
 void PermissionPromptImpl::Deny() {
   if (delegate_)
     delegate_->Deny();
 }
+
+Profile* PermissionPromptImpl::GetProfile() {
+  return browser_->profile();
+}