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..ced18769e56ed76bee000287276dfed284274cec 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,15 @@ 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_) {
+    return show_upload_confirm_title_

[msw, 2017/06/29 20:10:24]

Can this instead calls something like save_card_bubble_view_->GetWindowTitle()
or maybe do something like switch (save_card_bubble_view_->GetCurrentFlowStep())
case X: return Y, etc.?

[Jared Saul, 2017/07/05 19:36:50]

The problem with that is that SaveCardBubbleView [1] is a cross-platform
interface for SaveCardBubbleViews, which is the one with all the logic (incl.
GetCurrentFlowStep()).  I'd have to add a GetWindowTitle() function to
SaveCardBubbleView and every platform would need to implement it separately. 
Thoughts?

That being said, I believe there are only two platforms (Mac/non-Mac) and if I
need to duplicate a lot of these changes for Mac, it may be worth it anyway...

[1]
https://cs.chromium.org/chromium/src/chrome/browser/ui/autofill/save_card_bub...

[msw, 2017/07/05 20:45:30]

Setting a |show_upload_confirm_title_| flag is just a bit weird, but it's okay.

+               ? l10n_util::GetStringFUTF16(
+                     IDS_AUTOFILL_SAVE_CARD_PROMPT_ENTER_CVC_TITLE,
+                     card_.NetworkAndLastFourDigits())
+               : l10n_util::GetStringUTF16(
+                     IDS_AUTOFILL_SAVE_CARD_PROMPT_TITLE_TO_CLOUD);
+  }
+  return l10n_util::GetStringUTF16(IDS_AUTOFILL_SAVE_CARD_PROMPT_TITLE_LOCAL);
 }
 
 base::string16 SaveCardBubbleControllerImpl::GetExplanatoryMessage() const {
@@ -214,6 +221,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 +229,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;