Use ViewStack to convert card upload request CVC experiment to 2-step flow

chrome/browser/ui/views/autofill/save_card_bubble_views.h

Index: chrome/browser/ui/views/autofill/save_card_bubble_views.h
diff --git a/chrome/browser/ui/views/autofill/save_card_bubble_views.h b/chrome/browser/ui/views/autofill/save_card_bubble_views.h
index ca03dfccfea71ed0fd7f56645b8188f69a4c2e7e..0603006f14b9be2e17d5687f65be76ca60b8c1dc 100644
--- a/chrome/browser/ui/views/autofill/save_card_bubble_views.h
+++ b/chrome/browser/ui/views/autofill/save_card_bubble_views.h
@@ -8,6 +8,7 @@
 #include "base/macros.h"
 #include "chrome/browser/ui/autofill/save_card_bubble_view.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_bubble_delegate_view.h"
+#include "chrome/browser/ui/views/payments/view_stack.h"
 #include "components/autofill/core/browser/ui/save_card_bubble_controller.h"
 #include "ui/views/controls/link_listener.h"
 #include "ui/views/controls/styled_label_listener.h"
@@ -78,17 +79,22 @@ class SaveCardBubbleViews : public SaveCardBubbleView,
   ~SaveCardBubbleViews() override;
 
   std::unique_ptr<views::View> CreateMainContentView();
-  std::unique_ptr<views::View> CreateRequestCvcView();
+  void CreateAndAddRequestCvcViewToViewStack();
+
+  // Returns whether the upload or local save version of the UI is being shown.
+  bool IsUploading();
 
   // views::BubbleDialogDelegateView
   void Init() override;
 
   SaveCardBubbleController* controller_;  // Weak reference.
 
-  views::Textfield* cvc_textfield_;
-
   views::Link* learn_more_link_;

[Mathieu, 2017/05/17 23:53:01]

curious: any reason for bringing this up ? 

[Jared Saul, 2017/05/18 17:01:23]

It was purely so that it wasn't mistaken as part of the "// Upload save state"
block.  Since view_stack_ is going to be used in both local and upload cases,
though, I reverted this.

 
+  // Upload save state
+  std::unique_ptr<ViewStack> view_stack_;
+  views::Textfield* cvc_textfield_;
+
   DISALLOW_COPY_AND_ASSIGN(SaveCardBubbleViews);
 };