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

chrome/browser/media/media_stream_infobar_delegate_android.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/media/media_stream_infobar_delegate_android.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/logging.h"
@@ skipping 90 matching lines @@
                             kPermissionActionsMax);
   controller_->Cancelled();
 }
 
 MediaStreamInfoBarDelegateAndroid*
 MediaStreamInfoBarDelegateAndroid::AsMediaStreamInfoBarDelegateAndroid() {
   return this;
 }
 
 base::string16 MediaStreamInfoBarDelegateAndroid::GetMessageText() const {
-  int message_id = IDS_MEDIA_CAPTURE_AUDIO_AND_VIDEO;
-  if (!controller_->IsAskingForAudio())
-    message_id = IDS_MEDIA_CAPTURE_VIDEO_ONLY;
-  else if (!controller_->IsAskingForVideo())
-    message_id = IDS_MEDIA_CAPTURE_AUDIO_ONLY;
-  return l10n_util::GetStringFUTF16(
-      message_id, base::UTF8ToUTF16(controller_->GetSecurityOriginSpec()));
+  return controller_->GetMessageText();
 }
 
 base::string16 MediaStreamInfoBarDelegateAndroid::GetButtonLabel(
     InfoBarButton button) const {
   return l10n_util::GetStringUTF16((button == BUTTON_OK)
                                        ? IDS_MEDIA_CAPTURE_ALLOW
                                        : IDS_MEDIA_CAPTURE_BLOCK);
 }
 
 bool MediaStreamInfoBarDelegateAndroid::Accept() {
-  GURL origin(controller_->GetSecurityOriginSpec());
-  if (content::IsOriginSecure(origin)) {
+  if (content::IsOriginSecure(controller_->GetOrigin())) {
     UMA_HISTOGRAM_ENUMERATION("Media.DevicePermissionActions", kAllowHttps,
                               kPermissionActionsMax);
   } else {
     UMA_HISTOGRAM_ENUMERATION("Media.DevicePermissionActions", kAllowHttp,
                               kPermissionActionsMax);
   }
   controller_->PermissionGranted();
   return true;
 }
 
 bool MediaStreamInfoBarDelegateAndroid::Cancel() {
   UMA_HISTOGRAM_ENUMERATION("Media.DevicePermissionActions", kDeny,
                             kPermissionActionsMax);
   controller_->PermissionDenied();
   return true;
 }
 
 base::string16 MediaStreamInfoBarDelegateAndroid::GetLinkText() const {
   return base::string16();
 }
 
 GURL MediaStreamInfoBarDelegateAndroid::GetLinkURL() const {
   return GURL(chrome::kMediaAccessLearnMoreUrl);
 }