Change PermissionBubbleRequest::GetRequestingHostname to GetOrigin

This was usually already an origin, and is used for security-sensitive
purposes such as de-duplicating permission bubble requests (see also
https://codereview.chromium.org/1610753002), so renaming it to GetOrigin
to be explicit.

BUG=577313

Review URL: https://codereview.chromium.org/1637913002

Cr-Commit-Position: refs/heads/master@{#371795}

chrome/browser/chrome_quota_permission_context.cc

@@ -61,7 +61,7 @@ class QuotaPermissionRequest : public PermissionBubbleRequest {
   base::string16 GetMessageText() const override;
   base::string16 GetMessageTextFragment() const override;
   bool HasUserGesture() const override;
-  GURL GetRequestingHostname() const override;
+  GURL GetOrigin() const override;
   void PermissionGranted() override;
   void PermissionDenied() override;
   void Cancelled() override;
@@ -116,7 +116,7 @@ bool QuotaPermissionRequest::HasUserGesture() const {
   return user_gesture_;
 }
 
-GURL QuotaPermissionRequest::GetRequestingHostname() const {
+GURL QuotaPermissionRequest::GetOrigin() const {
   return origin_url_;
 }
 

chrome/browser/custom_handlers/register_protocol_handler_permission_request.cc

@@ -37,7 +37,7 @@ RegisterProtocolHandlerPermissionRequest
       bool user_gesture)
     : registry_(registry),
       handler_(handler),
-      url_(url),
+      origin_(url.GetOrigin()),
       user_gesture_(user_gesture) {}
 
 RegisterProtocolHandlerPermissionRequest::
@@ -92,8 +92,8 @@ bool RegisterProtocolHandlerPermissionRequest::HasUserGesture() const {
   return user_gesture_;
 }
 
-GURL RegisterProtocolHandlerPermissionRequest::GetRequestingHostname() const {
-  return url_;
+GURL RegisterProtocolHandlerPermissionRequest::GetOrigin() const {
+  return origin_;
 }
 
 void RegisterProtocolHandlerPermissionRequest::PermissionGranted() {

chrome/browser/custom_handlers/register_protocol_handler_permission_request.h

@@ -30,7 +30,7 @@ class RegisterProtocolHandlerPermissionRequest
   base::string16 GetMessageText() const override;
   base::string16 GetMessageTextFragment() const override;
   bool HasUserGesture() const override;
-  GURL GetRequestingHostname() const override;
+  GURL GetOrigin() const override;
   void PermissionGranted() override;
   void PermissionDenied() override;
   void Cancelled() override;
@@ -39,7 +39,7 @@ class RegisterProtocolHandlerPermissionRequest
  private:
   ProtocolHandlerRegistry* registry_;
   ProtocolHandler handler_;
-  GURL url_;
+  GURL origin_;
   bool user_gesture_;
 
   DISALLOW_COPY_AND_ASSIGN(RegisterProtocolHandlerPermissionRequest);

chrome/browser/download/download_permission_request.cc

@@ -14,7 +14,7 @@ DownloadPermissionRequest::DownloadPermissionRequest(
     : host_(host) {
   const content::WebContents* web_contents = host_->web_contents();
   DCHECK(web_contents);
-  request_url_ = web_contents->GetURL();
+  request_origin_ = web_contents->GetURL().GetOrigin();
 }
 
 DownloadPermissionRequest::~DownloadPermissionRequest() {}
@@ -40,8 +40,8 @@ bool DownloadPermissionRequest::HasUserGesture() const {
   return false;
 }
 
-GURL DownloadPermissionRequest::GetRequestingHostname() const {
-  return request_url_;
+GURL DownloadPermissionRequest::GetOrigin() const {
+  return request_origin_;
 }
 
 void DownloadPermissionRequest::PermissionGranted() {

chrome/browser/download/download_permission_request.h

@@ -25,7 +25,7 @@ class DownloadPermissionRequest : public PermissionBubbleRequest {
   base::string16 GetMessageText() const override;
   base::string16 GetMessageTextFragment() const override;
   bool HasUserGesture() const override;
-  GURL GetRequestingHostname() const override;
+  GURL GetOrigin() const override;
   void PermissionGranted() override;
   void PermissionDenied() override;
   void Cancelled() override;
@@ -33,7 +33,7 @@ class DownloadPermissionRequest : public PermissionBubbleRequest {
 
  private:
   base::WeakPtr<DownloadRequestLimiter::TabDownloadState> host_;
-  GURL request_url_;
+  GURL request_origin_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadPermissionRequest);
 };

chrome/browser/media/media_stream_devices_controller.cc

@@ -275,7 +275,7 @@ bool MediaStreamDevicesController::HasUserGesture() const {
   return request_.user_gesture;
 }
 
-GURL MediaStreamDevicesController::GetRequestingHostname() const {
+GURL MediaStreamDevicesController::GetOrigin() const {
   return request_.security_origin;
 }
 

chrome/browser/media/media_stream_devices_controller.h

@@ -55,7 +55,7 @@ class MediaStreamDevicesController : public PermissionBubbleRequest {
   base::string16 GetMessageText() const override;
   base::string16 GetMessageTextFragment() const override;
   bool HasUserGesture() const override;
-  GURL GetRequestingHostname() const override;
+  GURL GetOrigin() const override;
   void PermissionGranted() override;
   void PermissionDenied() override;
   void Cancelled() override;

chrome/browser/permissions/permission_bubble_request_impl.cc

@@ -150,7 +150,7 @@ bool PermissionBubbleRequestImpl::HasUserGesture() const {
   return user_gesture_;
 }
 
-GURL PermissionBubbleRequestImpl::GetRequestingHostname() const {
+GURL PermissionBubbleRequestImpl::GetOrigin() const {
   return request_origin_;
 }
 

chrome/browser/permissions/permission_bubble_request_impl.h

@@ -38,10 +38,7 @@ class PermissionBubbleRequestImpl : public PermissionBubbleRequest {
   base::string16 GetMessageText() const override;
   base::string16 GetMessageTextFragment() const override;
   bool HasUserGesture() const override;
-
-  // TODO(miguelg) Change this method to GetOrigin()
-  GURL GetRequestingHostname() const override;
-
+  GURL GetOrigin() const override;
   // Remember to call RegisterActionTaken for these methods if you are
   // overriding them.
   void PermissionGranted() override;

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

@@ -340,8 +340,7 @@ class MenuDelegate : public ui::SimpleMenuModel::Delegate {
   }
 
   base::scoped_nsobject<NSView> titleView(
-      [[self titleWithHostname:requests[0]->GetRequestingHostname().host()]
-          retain]);
+      [[self titleWithHostname:requests[0]->GetOrigin().host()] retain]);
   [contentView addSubview:titleView];
   [titleView setFrameOrigin:NSMakePoint(kHorizontalPadding,
                                         kVerticalPadding + yOffset)];
@@ -541,7 +540,7 @@ class MenuDelegate : public ui::SimpleMenuModel::Delegate {
   DCHECK(request);
   DCHECK(delegate_);
   base::scoped_nsobject<AllowBlockMenuButton> button(
-      [[AllowBlockMenuButton alloc] initForURL:request->GetRequestingHostname()
+      [[AllowBlockMenuButton alloc] initForURL:request->GetOrigin()
                                        allowed:allow
                                          index:index
                                       delegate:delegate_]);

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

@@ -191,7 +191,7 @@ class PermissionsBubbleDelegateView : public views::BubbleDelegateView,
   PermissionBubbleViewViews* owner_;
   views::Button* allow_;
   views::Button* deny_;
-  base::string16 hostname_;
+  base::string16 display_origin_;
   scoped_ptr<PermissionMenuModel> menu_button_model_;
   std::vector<PermissionCombobox*> customize_comboboxes_;
 
@@ -219,8 +219,8 @@ PermissionsBubbleDelegateView::PermissionsBubbleDelegateView(
   SetLayoutManager(new views::BoxLayout(
       views::BoxLayout::kVertical, kBubbleOuterMargin, 0, kItemMajorSpacing));
 
-  hostname_ = url_formatter::FormatUrlForSecurityDisplay(
-      requests[0]->GetRequestingHostname(), languages);
+  display_origin_ = url_formatter::FormatUrlForSecurityDisplay(
+      requests[0]->GetOrigin(), languages);
 
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   for (size_t index = 0; index < requests.size(); index++) {
@@ -262,9 +262,7 @@ PermissionsBubbleDelegateView::PermissionsBubbleDelegateView(
 
     if (requests.size() > 1) {
       PermissionCombobox* combobox = new PermissionCombobox(
-          this,
-          index,
-          requests[index]->GetRequestingHostname(),
+          this, index, requests[index]->GetOrigin(),
           accept_state[index] ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK);
       row_layout->AddView(combobox);
       customize_comboboxes_.push_back(combobox);
@@ -344,7 +342,7 @@ const gfx::FontList& PermissionsBubbleDelegateView::GetTitleFontList() const {
 
 base::string16 PermissionsBubbleDelegateView::GetWindowTitle() const {
   return l10n_util::GetStringFUTF16(IDS_PERMISSIONS_BUBBLE_PROMPT,
-                                    hostname_);
+                                    display_origin_);
 }
 
 void PermissionsBubbleDelegateView::SizeToContents() {

chrome/browser/ui/website_settings/mock_permission_bubble_request.cc

@@ -16,7 +16,7 @@ MockPermissionBubbleRequest::MockPermissionBubbleRequest()
   text_ = base::ASCIIToUTF16("test");
   accept_label_ = base::ASCIIToUTF16("button");
   deny_label_ = base::ASCIIToUTF16("button");
-  hostname_ = GURL("http://www.google.com");
+  origin_ = GURL("http://www.google.com");
 }
 
 MockPermissionBubbleRequest::MockPermissionBubbleRequest(
@@ -28,7 +28,7 @@ MockPermissionBubbleRequest::MockPermissionBubbleRequest(
   text_ = base::UTF8ToUTF16(text);
   accept_label_ = base::ASCIIToUTF16("button");
   deny_label_ = base::ASCIIToUTF16("button");
-  hostname_ = GURL("http://www.google.com");
+  origin_ = GURL("http://www.google.com");
 }
 
 MockPermissionBubbleRequest::MockPermissionBubbleRequest(
@@ -41,7 +41,7 @@ MockPermissionBubbleRequest::MockPermissionBubbleRequest(
   text_ = base::UTF8ToUTF16(text);
   accept_label_ = base::ASCIIToUTF16("button");
   deny_label_ = base::ASCIIToUTF16("button");
-  hostname_ = url;
+  origin_ = url.GetOrigin();
 }
 
 MockPermissionBubbleRequest::MockPermissionBubbleRequest(
@@ -55,7 +55,7 @@ MockPermissionBubbleRequest::MockPermissionBubbleRequest(
   text_ = base::UTF8ToUTF16(text);
   accept_label_ = base::UTF8ToUTF16(accept_label);
   deny_label_ = base::UTF8ToUTF16(deny_label);
-  hostname_ = GURL("http://www.google.com");
+  origin_ = GURL("http://www.google.com");
 }
 
 MockPermissionBubbleRequest::~MockPermissionBubbleRequest() {}
@@ -77,8 +77,8 @@ bool MockPermissionBubbleRequest::HasUserGesture() const {
   return user_gesture_;
 }
 
-GURL MockPermissionBubbleRequest::GetRequestingHostname() const {
-  return hostname_;
+GURL MockPermissionBubbleRequest::GetOrigin() const {
+  return origin_;
 }
 
 void MockPermissionBubbleRequest::PermissionGranted() {

chrome/browser/ui/website_settings/mock_permission_bubble_request.h

@@ -24,7 +24,7 @@ class MockPermissionBubbleRequest : public PermissionBubbleRequest {
   base::string16 GetMessageText() const override;
   base::string16 GetMessageTextFragment() const override;
   bool HasUserGesture() const override;
-  GURL GetRequestingHostname() const override;
+  GURL GetOrigin() const override;
 
   void PermissionGranted() override;
   void PermissionDenied() override;
@@ -46,7 +46,7 @@ class MockPermissionBubbleRequest : public PermissionBubbleRequest {
   base::string16 text_;
   base::string16 accept_label_;
   base::string16 deny_label_;
-  GURL hostname_;
+  GURL origin_;
 };
 
 #endif  // CHROME_BROWSER_UI_WEBSITE_SETTINGS_MOCK_PERMISSION_BUBBLE_REQUEST_H_

chrome/browser/ui/website_settings/permission_bubble_manager.cc

@@ -27,7 +27,7 @@ class CancelledRequest : public PermissionBubbleRequest {
         message_text_(cancelled->GetMessageText()),
         message_fragment_(cancelled->GetMessageTextFragment()),
         user_gesture_(cancelled->HasUserGesture()),
-        hostname_(cancelled->GetRequestingHostname()) {}
+        origin_(cancelled->GetOrigin()) {}
   ~CancelledRequest() override {}
 
   int GetIconId() const override { return icon_; }
@@ -36,7 +36,7 @@ class CancelledRequest : public PermissionBubbleRequest {
     return message_fragment_;
   }
   bool HasUserGesture() const override { return user_gesture_; }
-  GURL GetRequestingHostname() const override { return hostname_; }
+  GURL GetOrigin() const override { return origin_; }
 
   // These are all no-ops since the placeholder is non-forwarding.
   void PermissionGranted() override {}
@@ -50,7 +50,7 @@ class CancelledRequest : public PermissionBubbleRequest {
   base::string16 message_text_;
   base::string16 message_fragment_;
   bool user_gesture_;
-  GURL hostname_;
+  GURL origin_;
 };
 
 }  // namespace
@@ -105,9 +105,8 @@ void PermissionBubbleManager::AddRequest(PermissionBubbleRequest* request) {
   // correct behavior on interstitials -- we probably want to basically queue
   // any request for which GetVisibleURL != GetLastCommittedURL.
   request_url_ = web_contents()->GetLastCommittedURL();
-  bool is_main_frame =
-      url::Origin(request_url_)
-          .IsSameOriginWith(url::Origin(request->GetRequestingHostname()));
+  bool is_main_frame = url::Origin(request_url_)
+                           .IsSameOriginWith(url::Origin(request->GetOrigin()));
 
   // Don't re-add an existing request or one with a duplicate text request.
   // TODO(johnme): Instead of dropping duplicate requests, we should queue them
@@ -413,7 +412,7 @@ bool PermissionBubbleManager::ExistingRequest(
     }
     if ((*iter)->GetMessageTextFragment() ==
             request->GetMessageTextFragment() &&
-        (*iter)->GetRequestingHostname() == request->GetRequestingHostname()) {
+        (*iter)->GetOrigin() == request->GetOrigin()) {
       return true;
     }
   }

chrome/browser/ui/website_settings/permission_bubble_request.h

@@ -47,8 +47,8 @@ class PermissionBubbleRequest {
   // requests will have priority over non-gestured ones.
   virtual bool HasUserGesture() const = 0;
 
-  // Get the hostname on whose behalf this permission request is being made.
-  virtual GURL GetRequestingHostname() const = 0;
+  // Get the origin on whose behalf this permission request is being made.
+  virtual GURL GetOrigin() const = 0;
 
   // Called when the user has granted the requested permission.
   virtual void PermissionGranted() = 0;