Don't show scheme in permission prompts if it is HTTPS

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

Index: chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm
diff --git a/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm b/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm
index 9d9d634cdfdb2ddfe4a6f14c8146c4140843cbf4..0bcc1bd5d34e022119a70dd160a7d0154591ac74 100644
--- a/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm
+++ b/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm
@@ -29,6 +29,7 @@
 #include "chrome/browser/ui/website_settings/permission_bubble_view.h"
 #include "chrome/browser/ui/website_settings/permission_menu_model.h"
 #include "chrome/grit/generated_resources.h"
+#include "components/url_formatter/elide_url.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/user_metrics.h"
 #include "grit/components_strings.h"
@@ -39,6 +40,7 @@
 #include "ui/base/cocoa/window_size_constants.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/base/models/simple_menu_model.h"
+#include "url/gurl.h"
 
 using base::UserMetricsAction;
 
@@ -186,7 +188,7 @@ class MenuDelegate : public ui::SimpleMenuModel::Delegate {
 
 // Returns an autoreleased NSView displaying the title for the bubble
 // requesting settings for |host|.
-- (NSView*)titleWithHostname:(const std::string&)host;
+- (NSView*)titleWithOrigin:(const GURL&)origin;
 
 // Returns an autoreleased NSView displaying a menu for |request|.  The
 // menu will be initialized as 'allow' if |allow| is YES.
@@ -341,7 +343,7 @@ class MenuDelegate : public ui::SimpleMenuModel::Delegate {
   }
 
   base::scoped_nsobject<NSView> titleView(
-      [[self titleWithHostname:requests[0]->GetOrigin().host()] retain]);
+      [[self titleWithOrigin:requests[0]->GetOrigin()] retain]);
   [contentView addSubview:titleView];
   [titleView setFrameOrigin:NSMakePoint(kHorizontalPadding,
                                         kVerticalPadding + yOffset)];
@@ -518,16 +520,18 @@ class MenuDelegate : public ui::SimpleMenuModel::Delegate {
   return permissionView.autorelease();
 }
 
-- (NSView*)titleWithHostname:(const std::string&)host {
+- (NSView*)titleWithOrigin:(const GURL&)origin {
   base::scoped_nsobject<NSTextField> titleView(
       [[NSTextField alloc] initWithFrame:NSZeroRect]);
   [titleView setDrawsBackground:NO];
   [titleView setBezeled:NO];
   [titleView setEditable:NO];
   [titleView setSelectable:NO];
-  [titleView setStringValue:
-      l10n_util::GetNSStringF(IDS_PERMISSIONS_BUBBLE_PROMPT,
-                              base::UTF8ToUTF16(host))];
+  [titleView setStringValue:l10n_util::GetNSStringF(
+                                IDS_PERMISSIONS_BUBBLE_PROMPT,
+                                url_formatter::FormatUrlForSecurityDisplay(
+                                    origin, url_formatter::SchemeDisplay::
+                                                OMIT_CRYPTOGRAPHIC))];
   [titleView setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]];
   [titleView sizeToFit];
   NSRect titleFrame = [titleView frame];