Reland: Remove Finch support for PasswordBranding

chrome/browser/ui/passwords/manage_passwords_bubble_model.cc

 // Copyright 2013 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.
 
 #include "chrome/browser/ui/passwords/manage_passwords_bubble_model.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <limits>
@@ skipping 43 matching lines @@
     const std::vector<std::unique_ptr<autofill::PasswordForm>>& forms) {
   std::vector<autofill::PasswordForm> result;
   result.reserve(forms.size());
   std::transform(forms.begin(), forms.end(), std::back_inserter(result),
                  [](const std::unique_ptr<autofill::PasswordForm>& form) {
                    return *form;
                  });
   return result;
 }
 
-password_bubble_experiment::SmartLockBranding GetSmartLockBrandingState(
-    Profile* profile) {
+bool IsSmartLockUser(Profile* profile) {
   const browser_sync::ProfileSyncService* sync_service =
       ProfileSyncServiceFactory::GetForProfile(profile);
-  return password_bubble_experiment::GetSmartLockBrandingState(sync_service);
+  return password_bubble_experiment::IsSmartLockUser(sync_service);
 }
 
 }  // namespace
 
 // Class responsible for collecting and reporting all the runtime interactions
 // with the bubble.
 class ManagePasswordsBubbleModel::InteractionKeeper {
  public:
   InteractionKeeper(
       password_manager::InteractionsStats stats,
@@ skipping 65 matching lines @@
       sign_in_promo_dismissal_reason_(metrics_util::CHROME_SIGNIN_DISMISSED),
       interaction_stats_(std::move(stats)),
       clock_(new base::DefaultClock),
       sign_in_promo_shown_count(0) {}
 
 void ManagePasswordsBubbleModel::InteractionKeeper::ReportInteractions(
     const ManagePasswordsBubbleModel* model) {
   if (model->state() == password_manager::ui::PENDING_PASSWORD_STATE) {
     Profile* profile = model->GetProfile();
     if (profile) {
-      if (GetSmartLockBrandingState(profile) ==
-          password_bubble_experiment::SmartLockBranding::FULL) {
-        password_bubble_experiment::RecordSavePromptFirstRunExperienceWasShown(
-            profile->GetPrefs());
-      }
       if (dismissal_reason_ == metrics_util::NO_DIRECT_INTERACTION &&
           display_disposition_ ==
               metrics_util::AUTOMATIC_WITH_PASSWORD_PENDING) {
         if (interaction_stats_.dismissal_count <
             std::numeric_limits<decltype(
                 interaction_stats_.dismissal_count)>::max())
           interaction_stats_.dismissal_count++;
         interaction_stats_.update_time = clock_->Now();
         password_manager::PasswordStore* password_store =
             PasswordStoreFactory::GetForProfile(
@@ skipping 86 matching lines @@
   } else if (state_ == password_manager::ui::MANAGE_STATE) {
     local_credentials_ = DeepCopyForms(delegate_->GetCurrentForms());
     UpdateManageStateTitle();
     manage_link_ =
         l10n_util::GetStringUTF16(IDS_OPTIONS_PASSWORDS_MANAGE_PASSWORDS_LINK);
   }
 
   if (state_ == password_manager::ui::CONFIRMATION_STATE) {
     base::string16 save_confirmation_link =
         l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_LINK);
-    int confirmation_text_id = IDS_MANAGE_PASSWORDS_CONFIRM_GENERATED_TEXT;
-    if (GetSmartLockBrandingState(GetProfile()) ==
-        password_bubble_experiment::SmartLockBranding::FULL) {
-      std::string management_hostname =
-          GURL(password_manager::kPasswordManagerAccountDashboardURL).host();
-      save_confirmation_link = base::UTF8ToUTF16(management_hostname);
-      confirmation_text_id =
-          IDS_MANAGE_PASSWORDS_CONFIRM_GENERATED_SMART_LOCK_TEXT;
-    }
-
     size_t offset;
     save_confirmation_text_ =
-        l10n_util::GetStringFUTF16(
-            confirmation_text_id, save_confirmation_link, &offset);
+        l10n_util::GetStringFUTF16(IDS_MANAGE_PASSWORDS_CONFIRM_GENERATED_TEXT,
+                                   save_confirmation_link, &offset);
     save_confirmation_link_range_ =
         gfx::Range(offset, offset + save_confirmation_link.length());
   }
 
   password_manager::metrics_util::UIDisplayDisposition display_disposition =
       metrics_util::AUTOMATIC_WITH_PASSWORD_PENDING;
   if (display_reason == USER_ACTION) {
     switch (state_) {
       case password_manager::ui::PENDING_PASSWORD_STATE:
         display_disposition = metrics_util::MANUAL_WITH_PASSWORD_PENDING;
@@ skipping 86 matching lines @@
 }
 
 // TODO(gcasto): Is it worth having this be separate from OnDoneClicked()?
 // User intent is pretty similar in both cases.
 void ManagePasswordsBubbleModel::OnOKClicked() {
   interaction_keeper_->set_dismissal_reason(metrics_util::CLICKED_OK);
 }
 
 void ManagePasswordsBubbleModel::OnManageLinkClicked() {
   interaction_keeper_->set_dismissal_reason(metrics_util::CLICKED_MANAGE);
-  if (GetSmartLockBrandingState(GetProfile()) ==
-      password_bubble_experiment::SmartLockBranding::FULL) {
-    delegate_->NavigateToExternalPasswordManager();
-  } else {
-    delegate_->NavigateToPasswordManagerSettingsPage();
-  }
+  delegate_->NavigateToPasswordManagerSettingsPage();
 }
 
 void ManagePasswordsBubbleModel::OnBrandLinkClicked() {
   interaction_keeper_->set_dismissal_reason(metrics_util::CLICKED_BRAND_NAME);
   delegate_->NavigateToSmartLockHelpPage();
 }
 
 void ManagePasswordsBubbleModel::OnAutoSignInToastTimeout() {
   interaction_keeper_->set_dismissal_reason(
       metrics_util::AUTO_SIGNIN_TOAST_TIMEOUT);
@@ skipping 36 matching lines @@
 
 content::WebContents* ManagePasswordsBubbleModel::GetWebContents() const {
   return delegate_ ? delegate_->GetWebContents() : nullptr;
 }
 
 bool ManagePasswordsBubbleModel::ShouldShowMultipleAccountUpdateUI() const {
   return state_ == password_manager::ui::PENDING_PASSWORD_UPDATE_STATE &&
          local_credentials_.size() > 1 && !password_overridden_;
 }
 
-bool ManagePasswordsBubbleModel::ShouldShowGoogleSmartLockWelcome() const {
-  Profile* profile = GetProfile();
-  if (GetSmartLockBrandingState(profile) ==
-      password_bubble_experiment::SmartLockBranding::FULL) {
-    PrefService* prefs = profile->GetPrefs();
-    return !prefs->GetBoolean(
-        password_manager::prefs::kWasSavePrompFirstRunExperienceShown);
-  }
-  return false;
-}
-
 bool ManagePasswordsBubbleModel::ReplaceToShowSignInPromoIfNeeded() {
   DCHECK_EQ(password_manager::ui::PENDING_PASSWORD_STATE, state_);
   PrefService* prefs = GetProfile()->GetPrefs();
   const browser_sync::ProfileSyncService* sync_service =
       ProfileSyncServiceFactory::GetForProfile(GetProfile());
   if (password_bubble_experiment::ShouldShowChromeSignInPasswordPromo(
           prefs, sync_service)) {
     interaction_keeper_->ReportInteractions(this);
     title_brand_link_range_ = gfx::Range();
     title_ = l10n_util::GetStringUTF16(IDS_PASSWORD_MANAGER_SIGNIN_PROMO_TITLE);
@@ skipping 16 matching lines @@
 
 void ManagePasswordsBubbleModel::UpdatePendingStateTitle() {
   title_brand_link_range_ = gfx::Range();
   PasswordTitleType type =
       state_ == password_manager::ui::PENDING_PASSWORD_UPDATE_STATE
           ? PasswordTitleType::UPDATE_PASSWORD
           : (pending_password_.federation_origin.unique()
                  ? PasswordTitleType::SAVE_PASSWORD
                  : PasswordTitleType::SAVE_ACCOUNT);
   GetSavePasswordDialogTitleTextAndLinkRange(
-      GetWebContents()->GetVisibleURL(), origin_,
-      GetSmartLockBrandingState(GetProfile()) !=
-          password_bubble_experiment::SmartLockBranding::NONE,
+      GetWebContents()->GetVisibleURL(), origin_, IsSmartLockUser(GetProfile()),
       type, &title_, &title_brand_link_range_);
 }
 
 void ManagePasswordsBubbleModel::UpdateManageStateTitle() {
   GetManagePasswordsDialogTitleText(GetWebContents()->GetVisibleURL(), origin_,
                                     &title_);
 }
 
 metrics_util::UpdatePasswordSubmissionEvent
 ManagePasswordsBubbleModel::GetUpdateDismissalReason(
@@ skipping 18 matching lines @@
     return metrics_util::NO_UPDATE_SUBMISSION;
   }
   if (state_ != password_manager::ui::PENDING_PASSWORD_UPDATE_STATE)
     return metrics_util::NO_UPDATE_SUBMISSION;
   if (password_overridden_)
     return update_events[3][behavior];
   if (ShouldShowMultipleAccountUpdateUI())
     return update_events[2][behavior];
   return update_events[1][behavior];
 }