Fix wrong usages of profile at PaymentRequestHeader.

This CL fixes wrong usages of profile at PaymentRequestHeader by adding
extra profile parameter to |setTitleAndOrigin| function, while
PaymentRequestUI passes the profile to the function.

Bug: 1041781, 1075562
Change-Id: I9c23f54332c956ac27ea54ae6ef80c836034fcb7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2215807Reviewed-by: Rouslan Solomakhin <rouslan@chromium.org>
Reviewed-by: Ramin Halavati <rhalavati@chromium.org>
Commit-Queue: Side YILMAZ <sideyilmaz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#771805}

chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestHeader.java

@@ -58,19 +58,17 @@ public class PaymentRequestHeader extends FrameLayout {
      * @param title         The title to display on the header.
      * @param origin        The origin to display on the header.
      * @param securityLevel The security level of the page that invoked PaymentRequest.
+     * @param profile       The current profile to initialize ChromeAutocompleteSchemeClassifier.
      */
-    public void setTitleAndOrigin(String title, String origin, int securityLevel) {
+    public void setTitleAndOrigin(String title, String origin, int securityLevel, Profile profile) {
         ((TextView) findViewById(R.id.page_title)).setText(title);
 
         TextView hostName = (TextView) findViewById(R.id.hostname);
         Spannable url = new SpannableStringBuilder(origin);
         final boolean useDarkColors =
                 !ColorUtils.shouldUseLightForegroundOnBackground(mBackgroundColor);
-        // TODO(https://crbug.com/1041781): Use the current profile (i.e., regular profile or
-        // incognito profile) instead of always using regular profile. It is wrong and need to be
-        // fixed not to cause data leakage from incognito to regular profile.
         ChromeAutocompleteSchemeClassifier chromeAutocompleteSchemeClassifier =
-                new ChromeAutocompleteSchemeClassifier(Profile.getLastUsedRegularProfile());
+                new ChromeAutocompleteSchemeClassifier(profile);
         OmniboxUrlEmphasizer.emphasizeUrl(url, mContext.getResources(),
                 chromeAutocompleteSchemeClassifier, securityLevel, false /* isInternalPage */,
                 useDarkColors, true /* emphasizeHttpsScheme */);

chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java

@@ -405,7 +405,7 @@ public class PaymentRequestUI implements DimmingDialog.OnDismissListener, View.O
 
         mRequestView =
                 (ViewGroup) LayoutInflater.from(mContext).inflate(R.layout.payment_request, null);
-        prepareRequestView(mContext, title, origin, securityLevel, canAddCards);
+        prepareRequestView(mContext, title, origin, securityLevel, canAddCards, profile);
 
         mEditorDialog = new EditorDialog(activity, /*deleteRunnable =*/null, profile);
         DimmingDialog.setVisibleStatusBarIconColor(mEditorDialog.getWindow());
@@ -478,9 +478,10 @@ public class PaymentRequestUI implements DimmingDialog.OnDismissListener, View.O
      * @param origin        The RFC6454 origin of the page.
      * @param securityLevel The security level of the page that invoked PaymentRequest.
      * @param canAddCards   Whether new cards can be added.
+     * @param profile       The current profile to pass PaymentRequestHeader.
      */
-    private void prepareRequestView(
-            Context context, String title, String origin, int securityLevel, boolean canAddCards) {
+    private void prepareRequestView(Context context, String title, String origin, int securityLevel,
+            boolean canAddCards, Profile profile) {
         mSpinnyLayout = mRequestView.findViewById(R.id.payment_request_spinny);
         assert mSpinnyLayout.getVisibility() == View.VISIBLE;
         mIsShowingSpinner = true;
@@ -490,7 +491,7 @@ public class PaymentRequestUI implements DimmingDialog.OnDismissListener, View.O
         messageView.setText(R.string.payments_loading_message);
 
         ((PaymentRequestHeader) mRequestView.findViewById(R.id.header))
-                .setTitleAndOrigin(title, origin, securityLevel);
+                .setTitleAndOrigin(title, origin, securityLevel, profile);
 
         // Set up the buttons.
         mCloseButton = mRequestView.findViewById(R.id.close_button);