Further tweaks to the passphrase UI to deal with passphrase entry....

chrome/test/live_sync/two_client_live_passwords_sync_test.cc

Index: chrome/test/live_sync/two_client_live_passwords_sync_test.cc
===================================================================
--- chrome/test/live_sync/two_client_live_passwords_sync_test.cc	(revision 71271)
+++ chrome/test/live_sync/two_client_live_passwords_sync_test.cc	(working copy)
@@ -84,11 +84,11 @@
 IN_PROC_BROWSER_TEST_F(TwoClientLivePasswordsSyncTest, SetPassphrase) {
 #endif
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-  GetClient(0)->service()->SetPassphrase(kValidPassphrase, true);
+  GetClient(0)->service()->SetPassphrase(kValidPassphrase, true, true);
   GetClient(0)->AwaitPassphraseAccepted();
   GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1));
   ASSERT_TRUE(GetClient(1)->service()->observed_passphrase_required());
-  GetClient(1)->service()->SetPassphrase(kValidPassphrase, true);
+  GetClient(1)->service()->SetPassphrase(kValidPassphrase, true, true);
   GetClient(1)->AwaitPassphraseAccepted();
   ASSERT_FALSE(GetClient(1)->service()->observed_passphrase_required());
 }
@@ -102,7 +102,7 @@
                        SetPassphraseAndAddPassword) {
 #endif
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-  GetClient(0)->service()->SetPassphrase(kValidPassphrase, true);
+  GetClient(0)->service()->SetPassphrase(kValidPassphrase, true, true);
   GetClient(0)->AwaitPassphraseAccepted();
 
   PasswordForm form;
@@ -117,7 +117,7 @@
   ASSERT_EQ(1, GetClient(1)->GetLastSessionSnapshot()->
       num_conflicting_updates);
 
-  GetClient(1)->service()->SetPassphrase(kValidPassphrase, true);
+  GetClient(1)->service()->SetPassphrase(kValidPassphrase, true, true);
   GetClient(1)->AwaitPassphraseAccepted();
   ASSERT_FALSE(GetClient(1)->service()->observed_passphrase_required());
   GetClient(1)->AwaitSyncCycleCompletion("Accept passphrase and decrypt.");
@@ -131,14 +131,14 @@
                        DISABLED_SetPassphraseAndThenSetupSync) {
   ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
   ASSERT_TRUE(GetClient(0)->SetupSync());
-  GetClient(0)->service()->SetPassphrase(kValidPassphrase, true);
+  GetClient(0)->service()->SetPassphrase(kValidPassphrase, true, true);
   GetClient(0)->AwaitPassphraseAccepted();
   GetClient(0)->AwaitSyncCycleCompletion("Initial sync.");
 
   ASSERT_TRUE(GetClient(1)->SetupSync());
   ASSERT_TRUE(AwaitQuiescence());
   ASSERT_TRUE(GetClient(1)->service()->observed_passphrase_required());
-  GetClient(1)->service()->SetPassphrase(kValidPassphrase, true);
+  GetClient(1)->service()->SetPassphrase(kValidPassphrase, true, true);
   GetClient(1)->AwaitPassphraseAccepted();
   ASSERT_FALSE(GetClient(1)->service()->observed_passphrase_required());
 }
@@ -149,16 +149,16 @@
                        DISABLED_SetPassphraseTwice) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
-  GetClient(0)->service()->SetPassphrase(kValidPassphrase, true);
+  GetClient(0)->service()->SetPassphrase(kValidPassphrase, true, true);
   GetClient(0)->AwaitPassphraseAccepted();
   GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1));
   ASSERT_TRUE(GetClient(1)->service()->observed_passphrase_required());
 
-  GetClient(1)->service()->SetPassphrase(kValidPassphrase, true);
+  GetClient(1)->service()->SetPassphrase(kValidPassphrase, true, true);
   GetClient(1)->AwaitPassphraseAccepted();
   ASSERT_FALSE(GetClient(1)->service()->observed_passphrase_required());
 
-  GetClient(1)->service()->SetPassphrase(kValidPassphrase, true);
+  GetClient(1)->service()->SetPassphrase(kValidPassphrase, true, true);
   GetClient(1)->AwaitPassphraseAccepted();
   ASSERT_FALSE(GetClient(1)->service()->observed_passphrase_required());
 }