Fix message text for modal prompts when PermissionRequestManager enabled

chrome/browser/chrome_quota_permission_context.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/chrome_quota_permission_context.h"
 
 #include <stdint.h>
 
 #include <string>
 
@@ skipping 32 matching lines @@
 const int64_t kRequestLargeQuotaThreshold = 5 * 1024 * 1024;
 #endif
 
 // QuotaPermissionRequest ---------------------------------------------
 
 class QuotaPermissionRequest : public PermissionRequest {
  public:
   QuotaPermissionRequest(
       ChromeQuotaPermissionContext* context,
       const GURL& origin_url,
+      int64_t requested_quota,
       const content::QuotaPermissionContext::PermissionCallback& callback);
 
   ~QuotaPermissionRequest() override;
 
  private:
   // PermissionRequest:
   IconId GetIconId() const override;
+#if defined(OS_ANDROID)
+  base::string16 GetMessageText() const override;
+#endif
   base::string16 GetMessageTextFragment() const override;
   GURL GetOrigin() const override;
   void PermissionGranted() override;
   void PermissionDenied() override;
   void Cancelled() override;
   void RequestFinished() override;
   PermissionRequestType GetPermissionRequestType() const override;
 
   scoped_refptr<ChromeQuotaPermissionContext> context_;
   GURL origin_url_;
+  int64_t requested_quota_;
   content::QuotaPermissionContext::PermissionCallback callback_;
 
   DISALLOW_COPY_AND_ASSIGN(QuotaPermissionRequest);
 };
 
 QuotaPermissionRequest::QuotaPermissionRequest(
     ChromeQuotaPermissionContext* context,
     const GURL& origin_url,
+    int64_t requested_quota,
     const content::QuotaPermissionContext::PermissionCallback& callback)
     : context_(context),
       origin_url_(origin_url),
-      callback_(callback) {}
+      requested_quota_(requested_quota),
+      callback_(callback) {
+  // Suppress unused private field warning on desktop

[Lei Zhang, 2017/05/31 07:28:22]

Why not make |requested_quota_| Android only?

[Timothy Loh, 2017/06/01 04:12:39]

I figured it'd be messier to have the ifdefs for it (in particular inside
expressions and so on).

+  (void)requested_quota_;
+}
 
 QuotaPermissionRequest::~QuotaPermissionRequest() {}
 
 PermissionRequest::IconId QuotaPermissionRequest::GetIconId() const {
   // TODO(gbillock): get the proper image here
 #if defined(OS_ANDROID)
   return IDR_ANDROID_INFOBAR_WARNING;
 #else
   return ui::kWarningIcon;
 #endif
 }
 
+#if defined(OS_ANDROID)
+base::string16 QuotaPermissionRequest::GetMessageText() const {
+  // If the site requested larger quota than this threshold, show a different
+  // message to the user.
+  return l10n_util::GetStringFUTF16(
+      (requested_quota_ > kRequestLargeQuotaThreshold

[Lei Zhang, 2017/05/31 07:28:22]

BTW, this is really a criticism of the original code - |requested_quota_| can be
"const bool is_large_quota_request_" because this is its only usage.

[Timothy Loh, 2017/06/01 04:12:39]

I took the liberty to fix this (and const a couple other members).

+           ? IDS_REQUEST_LARGE_QUOTA_INFOBAR_QUESTION
+           : IDS_REQUEST_QUOTA_INFOBAR_QUESTION),
+      url_formatter::FormatUrlForSecurityDisplay(origin_url_));
+}
+#endif
+
 base::string16 QuotaPermissionRequest::GetMessageTextFragment() const {
   return l10n_util::GetStringUTF16(IDS_REQUEST_QUOTA_PERMISSION_FRAGMENT);
 }
 
 GURL QuotaPermissionRequest::GetOrigin() const {
   return origin_url_;
 }
 
 void QuotaPermissionRequest::PermissionGranted() {
   context_->DispatchCallbackOnIOThread(
@@ skipping 157 matching lines @@
     LOG(WARNING) << "Attempt to request quota tabless renderer: "
                  << render_process_id << "," << params.render_frame_id;
     DispatchCallbackOnIOThread(callback, QUOTA_PERMISSION_RESPONSE_CANCELLED);
     return;
   }
 
   if (PermissionRequestManager::IsEnabled()) {
     PermissionRequestManager* permission_request_manager =
         PermissionRequestManager::FromWebContents(web_contents);
     if (permission_request_manager) {
-      permission_request_manager->AddRequest(
-          new QuotaPermissionRequest(this, params.origin_url, callback));
+      permission_request_manager->AddRequest(new QuotaPermissionRequest(
+          this, params.origin_url, params.requested_size, callback));
       return;
     }
 #if defined(OS_ANDROID)
   } else {
     InfoBarService* infobar_service =
         InfoBarService::FromWebContents(web_contents);
     if (infobar_service) {
       RequestQuotaInfoBarDelegate::Create(infobar_service, this,
                                           params.origin_url,
                                           params.requested_size, callback);
@@ skipping 19 matching lines @@
         base::BindOnce(
             &ChromeQuotaPermissionContext::DispatchCallbackOnIOThread, this,
             callback, response));
     return;
   }
 
   callback.Run(response);
 }
 
 ChromeQuotaPermissionContext::~ChromeQuotaPermissionContext() {}