Update Chrome Upstream flow to reflect new UI mocks

chrome/browser/ui/autofill/save_card_bubble_controller_impl.cc

Index: chrome/browser/ui/autofill/save_card_bubble_controller_impl.cc
diff --git a/chrome/browser/ui/autofill/save_card_bubble_controller_impl.cc b/chrome/browser/ui/autofill/save_card_bubble_controller_impl.cc
index 4ce53664ac118eb18957f821fcf8aca4cbcba998..b197e9086571e6a89e676c504644be19dbd8c087 100644
--- a/chrome/browser/ui/autofill/save_card_bubble_controller_impl.cc
+++ b/chrome/browser/ui/autofill/save_card_bubble_controller_impl.cc
@@ -107,6 +107,7 @@ void SaveCardBubbleControllerImpl::HideBubble() {
     save_card_bubble_view_->Hide();
     save_card_bubble_view_ = nullptr;
   }
+  show_upload_confirm_title_ = false;
 }
 
 void SaveCardBubbleControllerImpl::ReshowBubble() {
@@ -134,9 +135,17 @@ SaveCardBubbleView* SaveCardBubbleControllerImpl::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 {
@@ -214,6 +223,7 @@ void SaveCardBubbleControllerImpl::OnLegalMessageLinkClicked(const GURL& url) {
 void SaveCardBubbleControllerImpl::OnBubbleClosed() {
   save_card_bubble_view_ = nullptr;
   UpdateIcon();
+  show_upload_confirm_title_ = false;
 }
 
 const LegalMessageLines& SaveCardBubbleControllerImpl::GetLegalMessageLines()
@@ -221,6 +231,11 @@ const LegalMessageLines& SaveCardBubbleControllerImpl::GetLegalMessageLines()
   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;