Replace kPreferHtmlOverPlugins feature checks with PluginUtils::ShouldPreferHtmlOverPlugi…

chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.h"
 
 #include <algorithm>
 
 #include "base/mac/bind_objc_block.h"
 #include "base/macros.h"
@@ skipping 66 matching lines @@
 // multiple permissions in the bubble.
 @interface AllowBlockMenuButton : NSPopUpButton {
  @private
   std::unique_ptr<PermissionMenuModel> menuModel_;
   base::scoped_nsobject<MenuController> menuController_;
 }
 
 - (id)initForURL:(const GURL&)url
          allowed:(BOOL)allow
            index:(int)index
-        delegate:(PermissionPrompt::Delegate*)delegate;
+        delegate:(PermissionPrompt::Delegate*)delegate
+         profile:(Profile*)profile;
 
 // Returns the maximum width of its possible titles.
 - (CGFloat)maximumTitleWidth;
 @end
 
 @implementation AllowBlockMenuButton
 
 - (id)initForURL:(const GURL&)url
          allowed:(BOOL)allow
            index:(int)index
-        delegate:(PermissionPrompt::Delegate*)delegate {
+        delegate:(PermissionPrompt::Delegate*)delegate
+         profile:(Profile*)profile {
   if (self = [super initWithFrame:NSZeroRect pullsDown:NO]) {
     ContentSetting setting =
         allow ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK;
     [self setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]];
     [self setBordered:NO];
 
     __block PermissionPrompt::Delegate* blockDelegate = delegate;
     __block AllowBlockMenuButton* blockSelf = self;
     PermissionMenuModel::ChangeCallback changeCallback =
         base::BindBlock(^(const WebsiteSettingsUI::PermissionInfo& permission) {
             blockDelegate->ToggleAccept(
                 index, permission.setting == CONTENT_SETTING_ALLOW);
             [blockSelf setFrameSize:
                 SizeForWebsiteSettingsButtonTitle(blockSelf,
                                                   [blockSelf title])];
         });
 
-    menuModel_.reset(new PermissionMenuModel(url, setting, changeCallback));
+    menuModel_.reset(
+        new PermissionMenuModel(profile, url, setting, changeCallback));
     menuController_.reset([[MenuController alloc] initWithModel:menuModel_.get()
                                          useWithPopUpButtonCell:NO]);
     [self setMenu:[menuController_ menu]];
     [self selectItemAtIndex:menuModel_->GetIndexOfCommandId(setting)];
     // Although the frame is reset, below, this sizes the cell properly.
     [self sizeToFit];
     // Adjust the size to fit the current title.  Using only -sizeToFit leaves
     // an ugly amount of whitespace between the title and the arrows because it
     // will fit to the largest element in the menu, not just the selected item.
     [self setFrameSize:SizeForWebsiteSettingsButtonTitle(self, [self title])];
@@ skipping 445 matching lines @@
 
 - (NSView*)menuForRequest:(PermissionRequest*)request
                   atIndex:(int)index
                     allow:(BOOL)allow {
   DCHECK(request);
   DCHECK(delegate_);
   base::scoped_nsobject<AllowBlockMenuButton> button(
       [[AllowBlockMenuButton alloc] initForURL:request->GetOrigin()
                                        allowed:allow
                                          index:index
-                                      delegate:delegate_]);
+                                      delegate:delegate_
+                                       profile:browser_->profile()]);
   return button.autorelease();
 }
 
 - (NSView*)buttonWithTitle:(NSString*)title
                     action:(SEL)action {
   base::scoped_nsobject<NSButton> button(
       [[ConstrainedWindowButton alloc] initWithFrame:NSZeroRect]);
   [button setButtonType:NSMomentaryPushInButton];
   [button setTitle:title];
   [button setTarget:self];
@@ skipping 61 matching lines @@
 
 + (void)alignCenterOf:(NSView*)viewA verticallyToCenterOf:(NSView*)viewB {
   NSRect frameA = [viewA frame];
   NSRect frameB = [viewB frame];
   frameA.origin.y =
       NSMinY(frameB) + std::floor((NSHeight(frameB) - NSHeight(frameA)) / 2);
   [viewA setFrameOrigin:frameA.origin];
 }
 
 @end  // implementation PermissionBubbleController