[Smart Lock] Update password generation prompt to conditionally use new branding

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 "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/password_manager/password_store_factory.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 100 matching lines @@
     // There is no title.
   } else {
     title_ = IsNewUIActive() ?
         l10n_util::GetStringFUTF16(IDS_MANAGE_ACCOUNTS_TITLE,
                                    base::UTF8ToUTF16(origin_.spec())) :
         l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_TITLE);
   }
 
   if (state_ == password_manager::ui::CONFIRMATION_STATE) {
     base::string16 save_confirmation_link =
-        l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_CONFIRM_GENERATED_LINK);
+        l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_LINK);
     size_t offset;
     save_confirmation_text_ =
         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());
   }
 
   manage_link_ =
       l10n_util::GetStringUTF16(IDS_OPTIONS_PASSWORDS_MANAGE_PASSWORDS_LINK);
@@ skipping 174 matching lines @@
 // static
 int ManagePasswordsBubbleModel::PasswordFieldWidth() {
   return GetFieldWidth(PASSWORD_FIELD);
 }
 
 void ManagePasswordsBubbleModel::UpdatePendingStateTitle() {
   title_brand_link_range_ = gfx::Range();
   if (never_save_passwords_) {
     title_ = l10n_util::GetStringUTF16(
         IDS_MANAGE_PASSWORDS_BLACKLIST_CONFIRMATION_TITLE);
-  } else if (password_bubble_experiment::IsEnabledSmartLockBranding(
+  } else if (password_bubble_experiment::IsSmartLockBrandingEnabled(
                  GetProfile())) {
     // "Google Smart Lock" should be a hyperlink.
     base::string16 brand_link =
         l10n_util::GetStringUTF16(IDS_PASSWORD_MANAGER_SMART_LOCK);
     size_t offset = 0;
     title_ = l10n_util::GetStringFUTF16(IDS_SAVE_PASSWORD, brand_link, &offset);
     title_brand_link_range_ = gfx::Range(offset, offset + brand_link.length());
   } else {
     base::string16 brand_link =
         l10n_util::GetStringUTF16(IDS_SAVE_PASSWORD_TITLE_BRAND);
     title_ = l10n_util::GetStringFUTF16(IDS_SAVE_PASSWORD, brand_link);
   }
 }