Update Chrome Upstream flow to reflect new UI mocks

chrome/browser/ui/autofill/save_card_bubble_controller_impl.cc

 // Copyright 2015 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/ui/autofill/save_card_bubble_controller_impl.h"
 
 #include <stddef.h>
 
 #include "chrome/browser/ui/autofill/save_card_bubble_view.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 89 matching lines @@
   card_ = card;
   save_card_callback_ = save_card_callback;
   ShowBubble();
 }
 
 void SaveCardBubbleControllerImpl::HideBubble() {
   if (save_card_bubble_view_) {
     save_card_bubble_view_->Hide();
     save_card_bubble_view_ = nullptr;
   }
+  show_upload_confirm_title_ = false;
 }
 
 void SaveCardBubbleControllerImpl::ReshowBubble() {
   // Don't show the bubble if it's already visible.
   if (save_card_bubble_view_)
     return;
 
   is_reshow_ = true;
   AutofillMetrics::LogSaveCardPromptMetric(
       AutofillMetrics::SAVE_CARD_PROMPT_SHOW_REQUESTED, is_uploading_,
       is_reshow_,
       pref_service_->GetInteger(
           prefs::kAutofillAcceptSaveCreditCardPromptState));
 
   ShowBubble();
 }
 
 bool SaveCardBubbleControllerImpl::IsIconVisible() const {
   return !save_card_callback_.is_null();
 }
 
 SaveCardBubbleView* SaveCardBubbleControllerImpl::save_card_bubble_view()
     const {
   return save_card_bubble_view_;
 }
 
 base::string16 SaveCardBubbleControllerImpl::GetWindowTitle() const {
-  return l10n_util::GetStringUTF16(
-      is_uploading_ ? IDS_AUTOFILL_SAVE_CARD_PROMPT_TITLE_TO_CLOUD
-                    : IDS_AUTOFILL_SAVE_CARD_PROMPT_TITLE_LOCAL);
+  if (is_uploading_) {

[Mathieu, 2017/06/27 21:12:06]

if (is_uploading_) {
  return show_upload_confirm_title_ ? ... : ...;
}
return l10n_util::GetStringUTF16(IDS_AUTOFILL_SAVE_CARD_PROMPT_TITLE_LOCAL);

[Jared Saul, 2017/06/27 21:45:55]

Done.

+    if (show_upload_confirm_title_)
+      return l10n_util::GetStringFUTF16(
+          IDS_AUTOFILL_SAVE_CARD_PROMPT_ENTER_CVC_TITLE,
+          card_.NetworkAndLastFourDigits());
+    else
+      return l10n_util::GetStringUTF16(
+          IDS_AUTOFILL_SAVE_CARD_PROMPT_TITLE_TO_CLOUD);
+  } else {
+    return l10n_util::GetStringUTF16(IDS_AUTOFILL_SAVE_CARD_PROMPT_TITLE_LOCAL);
+  }
 }
 
 base::string16 SaveCardBubbleControllerImpl::GetExplanatoryMessage() const {
   return is_uploading_ ? l10n_util::GetStringUTF16(
                              IDS_AUTOFILL_SAVE_CARD_PROMPT_UPLOAD_EXPLANATION)
                        : base::string16();
 }
 
 const CreditCard SaveCardBubbleControllerImpl::GetCard() const {
   return card_;
@@ skipping 57 matching lines @@
   AutofillMetrics::LogSaveCardPromptMetric(
       AutofillMetrics::SAVE_CARD_PROMPT_DISMISS_CLICK_LEGAL_MESSAGE,
       is_uploading_, is_reshow_,
       pref_service_->GetInteger(
           prefs::kAutofillAcceptSaveCreditCardPromptState));
 }
 
 void SaveCardBubbleControllerImpl::OnBubbleClosed() {
   save_card_bubble_view_ = nullptr;
   UpdateIcon();
+  show_upload_confirm_title_ = false;
 }
 
 const LegalMessageLines& SaveCardBubbleControllerImpl::GetLegalMessageLines()
     const {
   return legal_message_lines_;
 }
 
+void SaveCardBubbleControllerImpl::SetShowUploadConfirmTitle(
+    bool show_upload_confirm_title) {
+  show_upload_confirm_title_ = show_upload_confirm_title;
+}
+
 bool SaveCardBubbleControllerImpl::InputCvcIsValid(
     const base::string16& input_text) const {
   base::string16 trimmed_text;
   base::TrimWhitespace(input_text, base::TRIM_ALL, &trimmed_text);
   return IsValidCreditCardSecurityCode(trimmed_text, card_.network());
 }
 
 base::TimeDelta SaveCardBubbleControllerImpl::Elapsed() const {
   return timer_->Elapsed();
 }
@@ skipping 71 matching lines @@
   location_bar->UpdateSaveCreditCardIcon();
 }
 
 void SaveCardBubbleControllerImpl::OpenUrl(const GURL& url) {
   web_contents()->OpenURL(content::OpenURLParams(
       url, content::Referrer(), WindowOpenDisposition::NEW_FOREGROUND_TAB,
       ui::PAGE_TRANSITION_LINK, false));
 }
 
 }  // namespace autofill