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

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

This also changes IsSmartLockedBrandingEnabled() to only return true if the user is syncing without using a custom passphrase.

BUG=486739
Committed: https://crrev.com/b3b8d6c41c4c6f2a021cc02b9ebc5f414d89cf10
Cr-Commit-Position: refs/heads/master@{#330149}

[Garrett Casto, 2015-05-14 19:20:51]

gcasto@chromium.org changed reviewers:
+ estade@chromium.org, vabr@chromium.org

[Garrett Casto, 2015-05-14 19:20:52]

estade: chrome/browser/ui/autofill changes
vabr: Everything else.

[Garrett Casto, 2015-05-14 20:46:09]

Screenshot at https://code.google.com/p/chromium/issues/detail?id=486739#c20

[Garrett Casto, 2015-05-14 21:43:09]

The CQ bit was checked by gcasto@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2015-05-14 21:44:19]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1138523005/40001

[Evan Stade, 2015-05-14 21:58:02]

chrome/browser/ui/autofill/password_generation_popup_controller_impl.cc lgtm

https://codereview.chromium.org/1138523005/diff/40001/chrome/browser/ui/autof...
File chrome/browser/ui/autofill/password_generation_popup_controller_impl.cc
(right):

https://codereview.chromium.org/1138523005/diff/40001/chrome/browser/ui/autof...
chrome/browser/ui/autofill/password_generation_popup_controller_impl.cc:92: int
link_id;
nit: non-initialization makes me queasy, can we do

int link_id = FOO;
if (...)
  link_id = BAR;

[Garrett Casto, 2015-05-14 22:23:31]

https://codereview.chromium.org/1138523005/diff/40001/chrome/browser/ui/autof...
File chrome/browser/ui/autofill/password_generation_popup_controller_impl.cc
(right):

https://codereview.chromium.org/1138523005/diff/40001/chrome/browser/ui/autof...
chrome/browser/ui/autofill/password_generation_popup_controller_impl.cc:92: int
link_id;
On 2015/05/14 21:58:01, Evan Stade wrote:
> nit: non-initialization makes me queasy, can we do
> 
> int link_id = FOO;
> if (...)
>   link_id = BAR;

Done. Definitely better.

[vabr (Chromium), 2015-05-15 11:24:45]

lgtm

https://codereview.chromium.org/1138523005/diff/60001/chrome/browser/ui/passw...
File chrome/browser/ui/passwords/password_bubble_experiment.cc (right):

https://codereview.chromium.org/1138523005/diff/60001/chrome/browser/ui/passw...
chrome/browser/ui/passwords/password_bubble_experiment.cc:15: const char
kBrandingExperimentName[] = "PasswordBranding";
I'll change the Finch config in the internal CL 93306312 to reflect this once
the CL lands. Mentioning it here to highlight a potential clash just in case you
also were adding some Finch configs.

[Garrett Casto, 2015-05-15 16:53:39]

The CQ bit was checked by gcasto@chromium.org

[Garrett Casto, 2015-05-15 16:53:39]

The patchset sent to the CQ was uploaded after l-g-t-m from estade@chromium.org
Link to the patchset: https://codereview.chromium.org/1138523005/#ps60001
(title: "Comments")

[commit-bot: I haz the power, 2015-05-15 16:55:39]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1138523005/60001

[commit-bot: I haz the power, 2015-05-15 17:51:50]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-05-15 17:51:53]

Failed to apply patch for
chrome/browser/ui/passwords/password_bubble_experiment.cc:
While running git apply --index -3 -p1;
  error: patch failed:
chrome/browser/ui/passwords/password_bubble_experiment.cc:23
  Falling back to three-way merge...
  Applied patch to 'chrome/browser/ui/passwords/password_bubble_experiment.cc'
with conflicts.
  U chrome/browser/ui/passwords/password_bubble_experiment.cc

Patch:       chrome/browser/ui/passwords/password_bubble_experiment.cc
Index: chrome/browser/ui/passwords/password_bubble_experiment.cc
diff --git a/chrome/browser/ui/passwords/password_bubble_experiment.cc
b/chrome/browser/ui/passwords/password_bubble_experiment.cc
index
4402e801f685778c8e7d0651eb232e80c5c152b3..0988d2b3dde6125df39141861085a6fe7d34183e
100644
--- a/chrome/browser/ui/passwords/password_bubble_experiment.cc
+++ b/chrome/browser/ui/passwords/password_bubble_experiment.cc
@@ -12,7 +12,7 @@
 namespace password_bubble_experiment {
 namespace {
 
-const char kBrandingExperimentName[] = "PasswordBubbleBranding";
+const char kBrandingExperimentName[] = "PasswordBranding";
 const char kSmartLockBrandingGroupName[] = "SmartLockBranding";
 
 } // namespace
@@ -23,13 +23,15 @@ void RecordBubbleClosed(
   // TODO(vasilii): store the statistics.
 }
 
-bool IsEnabledSmartLockBranding(Profile* profile) {
+bool IsSmartLockBrandingEnabled(Profile* profile) {
   const ProfileSyncService* sync_service =
       ProfileSyncServiceFactory::GetForProfile(profile);
-  return password_manager_util::GetPasswordSyncState(sync_service) &&
-         base::FieldTrialList::FindFullName(kBrandingExperimentName) ==
-             kSmartLockBrandingGroupName;
-}
+  if (password_manager_util::GetPasswordSyncState(sync_service) !=
+      password_manager::SYNCING_NORMAL_ENCRYPTION)
+    return false;
 
+  return base::FieldTrialList::FindFullName(kBrandingExperimentName) ==
+      kSmartLockBrandingGroupName;
+}
 
 }  // namespace password_bubble_experiment

[commit-bot: I haz the power, 2015-05-15 17:52:22]

The CQ bit was unchecked by commit-bot@chromium.org

[Garrett Casto, 2015-05-15 18:02:53]

The CQ bit was checked by gcasto@chromium.org

[Garrett Casto, 2015-05-15 18:02:53]

The patchset sent to the CQ was uploaded after l-g-t-m from vabr@chromium.org,
estade@chromium.org
Link to the patchset: https://codereview.chromium.org/1138523005/#ps80001
(title: "Rebase")

[commit-bot: I haz the power, 2015-05-15 18:04:00]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1138523005/80001

[commit-bot: I haz the power, 2015-05-15 18:53:29]

Committed patchset #5 (id:80001)

[commit-bot: I haz the power, 2015-05-15 18:54:21]

Patchset 5 (id:??) landed as
https://crrev.com/b3b8d6c41c4c6f2a021cc02b9ebc5f414d89cf10
Cr-Commit-Position: refs/heads/master@{#330149}