Remove is_default_promo_account from native turn sync on promos.

As is_default_promo_account is always true for the native turn sync
on promos, this CL removes this argument from the DiceBubbleSyncPromo
and its delegates.

Bug: 1140978
Change-Id: I343b9e1a8cab16232f618bd7ca34bcbfdb44748f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2489982Reviewed-by: David Roger <droger@chromium.org>
Commit-Queue: David Roger <droger@chromium.org>
Commit-Queue: Mihai Sardarescu <msarda@chromium.org>
Cr-Commit-Position: refs/heads/master@{#819372}

chrome/browser/ui/autofill/payments/save_card_bubble_controller.h

@@ -84,9 +84,9 @@ class SaveCardBubbleController {
 
   // Interaction.
   // OnSyncPromoAccepted is called when the Dice Sign-in promo is clicked.
-  virtual void OnSyncPromoAccepted(const AccountInfo& account,
-                                   signin_metrics::AccessPoint access_point,
-                                   bool is_default_promo_account) = 0;
+  virtual void OnSyncPromoAccepted(
+      const AccountInfo& account,
+      signin_metrics::AccessPoint access_point) = 0;
   // OnSaveButton takes in a struct representing the cardholder name,
   // expiration date month and expiration date year confirmed/entered by the
   // user if they were requested, or struct with empty strings otherwise.

chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc

@@ -349,13 +349,12 @@ bool SaveCardBubbleControllerImpl::ShouldShowSignInPromo() const {
 
 void SaveCardBubbleControllerImpl::OnSyncPromoAccepted(
     const AccountInfo& account,
-    signin_metrics::AccessPoint access_point,
-    bool is_default_promo_account) {
+    signin_metrics::AccessPoint access_point) {
   DCHECK(current_bubble_type_ == BubbleType::SIGN_IN_PROMO ||
          current_bubble_type_ == BubbleType::MANAGE_CARDS);
   Browser* browser = chrome::FindBrowserWithWebContents(web_contents());
   signin_ui_util::EnableSyncFromPromo(browser, account, access_point,
-                                      is_default_promo_account);
+                                      /*is_default_promo_account=*/true);
 }
 
 void SaveCardBubbleControllerImpl::OnSaveButton(

chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.h

@@ -130,8 +130,7 @@ class SaveCardBubbleControllerImpl
   // TODO(crbug.com/864702): Don't show promo if user is a butter user.
   bool ShouldShowSignInPromo() const override;
   void OnSyncPromoAccepted(const AccountInfo& account,
-                           signin_metrics::AccessPoint access_point,
-                           bool is_default_promo_account) override;
+                           signin_metrics::AccessPoint access_point) override;
   void OnSaveButton(const AutofillClient::UserProvidedCardDetails&
                         user_provided_card_details) override;
   void OnCancelButton() override;

chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.cc

@@ -26,13 +26,12 @@ BookmarkBubbleSignInDelegate::~BookmarkBubbleSignInDelegate() {
   BrowserList::RemoveObserver(this);
 }
 
-void BookmarkBubbleSignInDelegate::OnEnableSync(const AccountInfo& account,
-                                                bool is_default_promo_account) {
+void BookmarkBubbleSignInDelegate::OnEnableSync(const AccountInfo& account) {
   EnsureBrowser();
   signin_ui_util::EnableSyncFromPromo(
       browser_, account,
       signin_metrics::AccessPoint::ACCESS_POINT_BOOKMARK_BUBBLE,
-      is_default_promo_account);
+      /*is_default_promo_account=*/true);
 
   // TODO(msarda): Close the bookmarks bubble once the enable sync flow has
   // started.

chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.h

@@ -24,8 +24,7 @@ class BookmarkBubbleSignInDelegate : public BubbleSyncPromoDelegate,
   ~BookmarkBubbleSignInDelegate() override;
 
   // BubbleSyncPromoDelegate:
-  void OnEnableSync(const AccountInfo& account,
-                    bool is_default_promo_account) override;
+  void OnEnableSync(const AccountInfo& account) override;
 
   // BrowserListObserver:
   void OnBrowserRemoved(Browser* browser) override;

chrome/browser/ui/passwords/bubble_controllers/sign_in_promo_bubble_controller.cc

@@ -25,12 +25,11 @@ Profile* SignInPromoBubbleController::GetProfile() const {
 }
 
 void SignInPromoBubbleController::OnSignInToChromeClicked(
-    const AccountInfo& account,
-    bool is_default_promo_account) {
+    const AccountInfo& account) {
   // Enabling sync for an existing account and starting a new sign-in are
   // triggered by the user interacting with the sign-in promo.
   GetProfile()->GetPrefs()->SetBoolean(
       password_manager::prefs::kWasSignInPasswordPromoClicked, true);
   if (delegate_)
-    delegate_->EnableSync(account, is_default_promo_account);
+    delegate_->EnableSync(account);
 }

chrome/browser/ui/passwords/bubble_controllers/sign_in_promo_bubble_controller.h

@@ -22,8 +22,7 @@ class SignInPromoBubbleController {
 
   // Called by the view when the "Sign in" button or the "Sync to" button in the
   // promo bubble is clicked.
-  void OnSignInToChromeClicked(const AccountInfo& account,
-                               bool is_default_promo_account);
+  void OnSignInToChromeClicked(const AccountInfo& account);
 
  private:
   // A bridge to ManagePasswordsUIController instance.

chrome/browser/ui/passwords/bubble_controllers/sign_in_promo_bubble_controller_unittest.cc

@@ -73,10 +73,9 @@ TEST_F(SignInPromoBubbleControllerTest, SignInPromoOK) {
   account.account_id = CoreAccountId("foo_account_id");
   account.gaia = "foo_gaia_id";
   account.email = "foo@bar.com";
-  EXPECT_CALL(*delegate(), EnableSync(AccountEq(account), false));
+  EXPECT_CALL(*delegate(), EnableSync(AccountEq(account)));
 
-  controller()->OnSignInToChromeClicked(account,
-                                        false /* is_default_promo_account */);
+  controller()->OnSignInToChromeClicked(account);
   EXPECT_TRUE(profile()->GetPrefs()->GetBoolean(
       password_manager::prefs::kWasSignInPasswordPromoClicked));
 }

chrome/browser/ui/passwords/manage_passwords_ui_controller.cc

@@ -623,13 +623,12 @@ void ManagePasswordsUIController::NavigateToPasswordCheckup(
   password_manager::LogPasswordCheckReferrer(referrer);
 }
 
-void ManagePasswordsUIController::EnableSync(const AccountInfo& account,
-                                             bool is_default_promo_account) {
+void ManagePasswordsUIController::EnableSync(const AccountInfo& account) {
   Browser* browser = chrome::FindBrowserWithWebContents(web_contents());
   signin_ui_util::EnableSyncFromPromo(
       browser, account,
       signin_metrics::AccessPoint::ACCESS_POINT_PASSWORD_BUBBLE,
-      is_default_promo_account);
+      /*is_default_promo_account=*/true);
 }
 
 void ManagePasswordsUIController::OnDialogHidden() {

chrome/browser/ui/passwords/manage_passwords_ui_controller.h

@@ -158,8 +158,7 @@ class ManagePasswordsUIController
       password_manager::ManagePasswordsReferrer referrer) override;
   void NavigateToPasswordManagerSettingsPage(
       password_manager::ManagePasswordsReferrer referrer) override;
-  void EnableSync(const AccountInfo& account,
-                  bool is_default_promo_account) override;
+  void EnableSync(const AccountInfo& account) override;
   void OnDialogHidden() override;
   bool AuthenticateUser() override;
   void AuthenticateUserForAccountStoreOptInAndSavePassword(

chrome/browser/ui/passwords/passwords_model_delegate.h

@@ -145,8 +145,7 @@ class PasswordsModelDelegate {
       password_manager::PasswordCheckReferrer referrer) = 0;
   // Called by the view when the "Sign in to Chrome" button or the "Sync to"
   // button in the promo bubble are clicked.
-  virtual void EnableSync(const AccountInfo& account,
-                          bool is_default_promo_account) = 0;
+  virtual void EnableSync(const AccountInfo& account) = 0;
 
   // Called from the dialog controller when the dialog is hidden.
   virtual void OnDialogHidden() = 0;

chrome/browser/ui/passwords/passwords_model_delegate_mock.h

@@ -89,10 +89,7 @@ class PasswordsModelDelegateMock
               NavigateToPasswordCheckup,
               (password_manager::PasswordCheckReferrer),
               (override));
-  MOCK_METHOD(void,
-              EnableSync,
-              (const AccountInfo& account, bool is_default_promo_account),
-              (override));
+  MOCK_METHOD(void, EnableSync, (const AccountInfo& account), (override));
   MOCK_METHOD(void, OnDialogHidden, (), (override));
   MOCK_METHOD(bool, AuthenticateUser, (), (override));
   MOCK_METHOD(void,

chrome/browser/ui/sync/bubble_sync_promo_delegate.h

@@ -16,8 +16,7 @@ class BubbleSyncPromoDelegate {
   // the browser sign-in page if |account| is empty.
   // |is_default_promo_account| is true if |account| corresponds to the default
   // account in the promo. It is ignored if |account| is empty.
-  virtual void OnEnableSync(const AccountInfo& account,
-                            bool is_default_promo_account) = 0;
+  virtual void OnEnableSync(const AccountInfo& account) = 0;
 };
 
 #endif  // CHROME_BROWSER_UI_SYNC_BUBBLE_SYNC_PROMO_DELEGATE_H_

chrome/browser/ui/views/autofill/payments/save_card_bubble_views.cc

@@ -43,10 +43,8 @@ SaveCardBubbleViews::SyncPromoDelegate::SyncPromoDelegate(
 }
 
 void SaveCardBubbleViews::SyncPromoDelegate::OnEnableSync(
-    const AccountInfo& account,
-    bool is_default_promo_account) {
-  controller_->OnSyncPromoAccepted(account, access_point_,
-                                   is_default_promo_account);
+    const AccountInfo& account) {
+  controller_->OnSyncPromoAccepted(account, access_point_);
 }
 
 SaveCardBubbleViews::SaveCardBubbleViews(views::View* anchor_view,

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

@@ -64,8 +64,7 @@ class SaveCardBubbleViews : public SaveCardBubbleView,
                       signin_metrics::AccessPoint access_point);
 
     // BubbleSyncPromoDelegate:
-    void OnEnableSync(const AccountInfo& account,
-                      bool is_default_promo_account) override;
+    void OnEnableSync(const AccountInfo& account) override;
 
    private:
     SaveCardBubbleController* controller_;

chrome/browser/ui/views/bookmarks/bookmark_bubble_sign_in_delegate_browsertest.cc

@@ -63,7 +63,7 @@ void BookmarkBubbleSignInDelegateTest::ReplaceBlank(Browser* browser) {
 void BookmarkBubbleSignInDelegateTest::SignInBrowser(Browser* browser) {
   std::unique_ptr<BubbleSyncPromoDelegate> delegate;
   delegate.reset(new BookmarkBubbleSignInDelegate(browser));
-  delegate->OnEnableSync(AccountInfo(), false /* is_default_promo_account */);
+  delegate->OnEnableSync(AccountInfo());
 }
 
 IN_PROC_BROWSER_TEST_F(BookmarkBubbleSignInDelegateTest, OnSignInLinkClicked) {
@@ -141,7 +141,7 @@ IN_PROC_BROWSER_TEST_F(BookmarkBubbleSignInDelegateTest, BrowserRemoved) {
   browser()->tab_strip_model()->CloseAllTabs();
   content::RunAllPendingInMessageLoop();
 
-  delegate->OnEnableSync(AccountInfo(), false /* is_default_promo_account */);
+  delegate->OnEnableSync(AccountInfo());
 
   int tab_count = extra_browser->tab_strip_model()->count();
   // A new tab should have been opened in the extra browser, which should be

chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc

@@ -135,8 +135,7 @@ class ExtensionInstalledBubbleView : public BubbleSyncPromoDelegate,
   void Init() override;
 
   // BubbleSyncPromoDelegate:
-  void OnEnableSync(const AccountInfo& account_info,
-                    bool is_default_promo_account) override;
+  void OnEnableSync(const AccountInfo& account_info) override;
 
   void LinkClicked();
 
@@ -254,12 +253,11 @@ void ExtensionInstalledBubbleView::Init() {
   }
 }
 
-void ExtensionInstalledBubbleView::OnEnableSync(const AccountInfo& account,
-                                                bool is_default_promo_account) {
+void ExtensionInstalledBubbleView::OnEnableSync(const AccountInfo& account) {
   signin_ui_util::EnableSyncFromPromo(
       browser_, account,
       signin_metrics::AccessPoint::ACCESS_POINT_EXTENSION_INSTALL_BUBBLE,
-      is_default_promo_account);
+      /*is_default_promo_account=*/true);
   GetWidget()->Close();
 }
 

chrome/browser/ui/views/passwords/password_sign_in_promo_view.cc

@@ -31,9 +31,8 @@ PasswordSignInPromoView::DiceSyncPromoDelegate::~DiceSyncPromoDelegate() =
     default;
 
 void PasswordSignInPromoView::DiceSyncPromoDelegate::OnEnableSync(
-    const AccountInfo& account,
-    bool is_default_promo_account) {
-  controller_->OnSignInToChromeClicked(account, is_default_promo_account);
+    const AccountInfo& account) {
+  controller_->OnSignInToChromeClicked(account);
 }
 
 PasswordSignInPromoView::PasswordSignInPromoView(

chrome/browser/ui/views/passwords/password_sign_in_promo_view.h

@@ -31,8 +31,7 @@ class PasswordSignInPromoView : public views::View {
     ~DiceSyncPromoDelegate() override;
 
     // BubbleSyncPromoDelegate:
-    void OnEnableSync(const AccountInfo& account,
-                      bool is_default_promo_account) override;
+    void OnEnableSync(const AccountInfo& account) override;
 
    private:
     SignInPromoBubbleController* controller_;

chrome/browser/ui/views/sync/dice_bubble_sync_promo_view.cc

@@ -55,10 +55,8 @@ DiceBubbleSyncPromoView::DiceBubbleSyncPromoView(
   }
 
   views::Button::PressedCallback callback = base::BindRepeating(
-      [](DiceBubbleSyncPromoView* promo) {
-        promo->EnableSync(true, promo->signin_button_view_->account());
-      },
-      base::Unretained(this));
+      &DiceBubbleSyncPromoView::EnableSync, base::Unretained(this));
+
   if (account.IsEmpty()) {
     signin_button_view_ = AddChildView(std::make_unique<DiceSigninButtonView>(
         std::move(callback), signin_button_prominent));
@@ -83,11 +81,9 @@ views::View* DiceBubbleSyncPromoView::GetSigninButtonForTesting() {
   return signin_button_view_ ? signin_button_view_->signin_button() : nullptr;
 }
 
-void DiceBubbleSyncPromoView::EnableSync(
-    bool is_default_promo_account,
-    const base::Optional<AccountInfo>& account) {
-  delegate_->OnEnableSync(account.value_or(AccountInfo()),
-                          is_default_promo_account);
+void DiceBubbleSyncPromoView::EnableSync() {
+  base::Optional<AccountInfo> account = signin_button_view_->account();
+  delegate_->OnEnableSync(account.value_or(AccountInfo()));
 }
 
 const char* DiceBubbleSyncPromoView::GetClassName() const {

chrome/browser/ui/views/sync/dice_bubble_sync_promo_view.h

@@ -50,8 +50,7 @@ class DiceBubbleSyncPromoView : public views::View {
  private:
   // Used to enable sync in the DiceAccountsMenu and when |signin_button_| is
   // pressed.
-  void EnableSync(bool is_default_promo_account,
-                  const base::Optional<AccountInfo>& account);
+  void EnableSync();
 
   // views::View:
   const char* GetClassName() const override;