Moved the handling of the initial passphrase into SyncSetupFlow.

chrome/test/live_sync/two_client_passwords_sync_test.cc

 // Copyright (c) 2011 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 "base/utf_string_conversions.h"
 #include "chrome/browser/sync/engine/model_safe_worker.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
 #include "chrome/browser/sync/sessions/session_state.h"
 #include "chrome/test/live_sync/live_sync_test.h"
 #include "chrome/test/live_sync/passwords_helper.h"
@@ skipping 120 matching lines @@
 }
 
 // TODO(sync): Enable after MockKeychain is fixed. http://crbug.com/89808.
 #if defined(OS_MACOSX)
 IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest, DISABLED_SetPassphrase) {
 #else
 IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest, SetPassphrase) {
 #endif
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
-  SetPassphrase(0, kValidPassphrase, true);
+  SetPassphrase(0, kValidPassphrase);
   ASSERT_TRUE(GetClient(0)->AwaitPassphraseAccepted());
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
 
-  SetPassphrase(1, kValidPassphrase, false);
+  SetPassphrase(1, kValidPassphrase);
   ASSERT_TRUE(GetClient(1)->AwaitPassphraseAccepted());
   ASSERT_TRUE(GetClient(1)->AwaitSyncCycleCompletion("Set passphrase."));
 }
 
 // TODO(sync): Enable after MockKeychain is fixed. http://crbug.com/89808.
 #if defined(OS_MACOSX)
 IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest,
                        DISABLED_SetPassphraseAndAddPassword) {
 #else
 IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest,
                        SetPassphraseAndAddPassword) {
 #endif
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
-  SetPassphrase(0, kValidPassphrase, true);
+  SetPassphrase(0, kValidPassphrase);
   ASSERT_TRUE(GetClient(0)->AwaitPassphraseAccepted());
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
 
-  SetPassphrase(1, kValidPassphrase, false);
+  SetPassphrase(1, kValidPassphrase);
   ASSERT_TRUE(GetClient(1)->AwaitPassphraseAccepted());
 
   PasswordForm form = CreateTestPasswordForm(0);
   AddLogin(GetPasswordStore(0), form);
   ASSERT_EQ(1, GetPasswordCount(0));
 
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_EQ(1, GetPasswordCount(1));
 }
 
@@ skipping 99 matching lines @@
 #if defined(OS_MACOSX)
 IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest,
                        DISABLED_SetPassphraseAndThenSetupSync) {
 #else
 IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest,
                        SetPassphraseAndThenSetupSync) {
 #endif
   ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
 
   ASSERT_TRUE(GetClient(0)->SetupSync());
-  SetPassphrase(0, kValidPassphrase, true);
+  SetPassphrase(0, kValidPassphrase);
   ASSERT_TRUE(GetClient(0)->AwaitPassphraseAccepted());
   ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion("Initial sync."));
 
   ASSERT_FALSE(GetClient(1)->SetupSync());
-  SetPassphrase(1, kValidPassphrase, false);
+  SetPassphrase(1, kValidPassphrase);
   ASSERT_TRUE(GetClient(1)->AwaitPassphraseAccepted());
   ASSERT_TRUE(GetClient(1)->AwaitSyncCycleCompletion("Initial sync."));
 
   // Following ensures types are enabled and active (see bug 87572).
   browser_sync::ModelSafeRoutingInfo routes;
   GetClient(0)->service()->GetModelSafeRoutingInfo(&routes);
   ASSERT_EQ(browser_sync::GROUP_PASSWORD, routes[syncable::PASSWORDS]);
   routes.clear();
   GetClient(1)->service()->GetModelSafeRoutingInfo(&routes);
   ASSERT_EQ(browser_sync::GROUP_PASSWORD, routes[syncable::PASSWORDS]);
 }
 
 // TODO(sync): Enable after MockKeychain is fixed. http://crbug.com/89808.
 #if defined(OS_MACOSX)
 IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest,
                        DISABLED_SetPassphraseTwice) {
 #else
 IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest,
                        SetPassphraseTwice) {
 #endif
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
-  SetPassphrase(0, kValidPassphrase, true);
+  SetPassphrase(0, kValidPassphrase);
   ASSERT_TRUE(GetClient(0)->AwaitPassphraseAccepted());
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
 
-  SetPassphrase(1, kValidPassphrase, false);
+  SetPassphrase(1, kValidPassphrase);
   ASSERT_TRUE(GetClient(1)->AwaitPassphraseAccepted());
   ASSERT_TRUE(GetClient(1)->AwaitSyncCycleCompletion("Set passphrase."));
 
-  SetPassphrase(1, kValidPassphrase, false);
+  SetPassphrase(1, kValidPassphrase);
   ASSERT_TRUE(GetClient(1)->AwaitPassphraseAccepted());
   ASSERT_TRUE(GetClient(1)->AwaitSyncCycleCompletion("Set passphrase again."));
 }