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

chrome/test/live_sync/two_client_live_passwords_sync_test.cc

 // Copyright (c) 2010 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/password_manager/password_form_data.h"
 #include "chrome/browser/sync/sessions/session_state.h"
 #include "chrome/test/live_sync/live_passwords_sync_test.h"
 
 using webkit_glue::PasswordForm;
 
@@ skipping 66 matching lines @@
   ASSERT_TRUE(ContainsSamePasswordForms(actual_zero, actual_one));
 }
 
 // TODO(sync): Remove FAILS_ annotation after http://crbug.com/59867 is fixed.
 #if defined(OS_MACOSX)
 IN_PROC_BROWSER_TEST_F(TwoClientLivePasswordsSyncTest, FAILS_SetPassphrase) {
 #else
 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());
 }
 
 // TODO(sync): Remove FAILS_ annotation after http://crbug.com/59867 is fixed.
 #if defined(OS_MACOSX)
 IN_PROC_BROWSER_TEST_F(TwoClientLivePasswordsSyncTest,
                        FAILS_SetPassphraseAndAddPassword) {
 #else
 IN_PROC_BROWSER_TEST_F(TwoClientLivePasswordsSyncTest,
                        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;
   form.origin = GURL("http://www.google.com/");
   form.username_value = ASCIIToUTF16("username");
   form.password_value = ASCIIToUTF16("password");
 
   AddLogin(GetPasswordStore(0), form);
 
   GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1));
   ASSERT_TRUE(GetClient(1)->service()->observed_passphrase_required());
   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.");
   ASSERT_EQ(0, GetClient(1)->GetLastSessionSnapshot()->
       num_conflicting_updates);
 }
 
 // TODO(sync): Remove DISABLED_ annotation after http://crbug.com/59867 and
 // http://crbug.com/67862 are fixed.
 IN_PROC_BROWSER_TEST_F(TwoClientLivePasswordsSyncTest,
                        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());
 }
 
 // TODO(sync): Remove DISABLED_ annotation after http://crbug.com/59867 and
 // http://crbug.com/67862 are fixed.
 IN_PROC_BROWSER_TEST_F(TwoClientLivePasswordsSyncTest,
                        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());
 }