Update Chrome Upstream flow to reflect new UI mocks

chrome/browser/ui/autofill/save_card_bubble_controller_impl.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_AUTOFILL_SAVE_CARD_BUBBLE_CONTROLLER_IMPL_H_
 #define CHROME_BROWSER_UI_AUTOFILL_SAVE_CARD_BUBBLE_CONTROLLER_IMPL_H_
 
 #include <memory>
 
 #include "base/macros.h"
@@ skipping 48 matching lines @@
   int GetCvcImageResourceId() const override;
   bool ShouldRequestCvcFromUser() const override;
   base::string16 GetCvcEnteredByUser() const override;
   void OnSaveButton(const base::string16& cvc = base::string16()) override;
   void OnCancelButton() override;
   void OnLearnMoreClicked() override;
   void OnLegalMessageLinkClicked(const GURL& url) override;
   void OnBubbleClosed() override;
 
   const LegalMessageLines& GetLegalMessageLines() const override;
+  void SetShowUploadConfirmTitle(bool show_upload_confirm_title) override;
 
   // Used to check if an entered CVC value is a valid CVC for the current card.
   // Valid CVCs are a certain length for their card type (4 for AMEX, 3
   // otherwise) and are comprised only of numbers.
   bool InputCvcIsValid(const base::string16& input_text) const override;
 
  protected:
   explicit SaveCardBubbleControllerImpl(content::WebContents* web_contents);
 
   // Returns the time elapsed since |timer_| was initialized.
@@ skipping 30 matching lines @@
 
   // Whether ReshowBubble() has been called since ShowBubbleFor*() was called.
   bool is_reshow_{false};
 
   // Whether the upload save version of the UI should ask the user for CVC.
   bool should_cvc_be_requested_{false};
 
   // The value of the CVC entered by the user (if it was requested).
   base::string16 cvc_entered_by_user_;
 
+  // Whether the normal title or the "Confirm [card]" title should be shown
+  // during upload save.
+  bool show_upload_confirm_title_{false};

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

nit: this curly-bracket init style is very uncommon for primitive members in the
codebase (afaict); consider using | = false;| here and elsewhere in this file,
unless I missed some very new style guidance on this topic.

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

I can't recall/find who originally told me to initialize them in this way, just
the request to do it here instead of in the ctor.  Changed to | = false;|.

+
   // Contains the details of the card that will be saved if the user accepts.
   CreditCard card_;
 
   // If no legal message should be shown then this variable is an empty vector.
   LegalMessageLines legal_message_lines_;
 
   // Used to measure the amount of time on a page; if it's less than some
   // reasonable limit, then don't close the bubble upon navigation.
   std::unique_ptr<base::ElapsedTimer> timer_;
 
   DISALLOW_COPY_AND_ASSIGN(SaveCardBubbleControllerImpl);
 };
 
 }  // namespace autofill
 
 #endif  // CHROME_BROWSER_UI_AUTOFILL_SAVE_CARD_BUBBLE_CONTROLLER_IMPL_H_