Replace kPreferHtmlOverPlugins feature checks with PluginUtils::ShouldPreferHtmlOverPlugi…

chrome/browser/ui/cocoa/website_settings/website_settings_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/website_settings_bubble_controller.h"
 
 #import <AppKit/AppKit.h>
 
 #include <cmath>
 
@@ skipping 161 matching lines @@
 }
 
 - (void)deleteClicked:(id)sender {
   callback_.Run(*objectInfo_);
 }
 
 @end
 
 @implementation WebsiteSettingsBubbleController
 
+- (Profile*)profile {

[tapted, 2016/10/11 02:22:16]

nit: move after the initializer (line ~242)

[raymes, 2016/10/11 03:50:02]

Done.

+  return Profile::FromBrowserContext(webContents_->GetBrowserContext());
+}
+
 - (CGFloat)defaultWindowWidth {
   return kDefaultWindowWidth;
 }
 
 bool IsInternalURL(const GURL& url) {
   return url.SchemeIs(content::kChromeUIScheme) ||
          url.SchemeIs(extensions::kExtensionScheme) ||
          url.SchemeIs(content::kViewSourceScheme);
 }
 
@@ skipping 538 matching lines @@
 
   GURL url = webContents_ ? webContents_->GetURL() : GURL();
   __block WebsiteSettingsBubbleController* weakSelf = self;
   PermissionMenuModel::ChangeCallback callback =
       base::BindBlock(^(const WebsiteSettingsUI::PermissionInfo& permission) {
           [weakSelf onPermissionChanged:permission.type to:permission.setting];
       });
   base::scoped_nsobject<PermissionSelectorButton> button(
       [[PermissionSelectorButton alloc] initWithPermissionInfo:permissionInfo
                                                         forURL:url
-                                                  withCallback:callback]);
+                                                  withCallback:callback
+                                                       profile:[self profile]]);
 
   // Determine the largest possible size for this button.
-  CGFloat maxTitleWidth = [button
-      maxTitleWidthForContentSettingsType:permissionInfo.type
-                       withDefaultSetting:permissionInfo.default_setting];
+  CGFloat maxTitleWidth =
+      [button maxTitleWidthForContentSettingsType:permissionInfo.type
+                               withDefaultSetting:permissionInfo.default_setting
+                                          profile:[self profile]];
 
   // Ensure the containing view is large enough to contain the button with its
   // widest possible title.
   NSRect containerFrame = [view frame];
   containerFrame.size.width =
       std::max(NSWidth(containerFrame),
                point.x + maxTitleWidth + kSectionHorizontalPadding);
   [view setFrame:containerFrame];
   [view addSubview:button.get()];
   return button.get();
@@ skipping 435 matching lines @@
 void WebsiteSettingsUIBridge::SetPermissionInfo(
     const PermissionInfoList& permission_info_list,
     const ChosenObjectInfoList& chosen_object_info_list) {
   [bubble_controller_ setPermissionInfo:permission_info_list
                        andChosenObjects:chosen_object_info_list];
 }
 
 void WebsiteSettingsUIBridge::SetSelectedTab(TabId tab_id) {
   // TODO(lgarron): Remove this from the interface. (crbug.com/571533)
 }