Sync: Support multiple setup UIs.

chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc

 // Copyright (c) 2012 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 <stdint.h>
 
 #include <limits>
 
 #include "base/guid.h"
 #include "base/hash.h"
@@ skipping 135 matching lines @@
 IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest,
                        SetPassphraseAndThenSetupSync) {
   ASSERT_TRUE(SetupClients());
 
   ASSERT_TRUE(GetClient(0)->SetupSync());
   SetEncryptionPassphrase(0, kValidPassphrase, ProfileSyncService::EXPLICIT);
   ASSERT_TRUE(AwaitPassphraseAccepted(GetSyncService(0)));
 
   // When client 1 hits a passphrase required state, we can infer that
   // client 0's passphrase has been committed. to the server.
-  GetClient(1)->SetupSync();
+  ASSERT_FALSE(GetClient(1)->SetupSync());
   ASSERT_TRUE(AwaitPassphraseRequired(GetSyncService(1)));
 
   // Get client 1 out of the passphrase required state.
   ASSERT_TRUE(SetDecryptionPassphrase(1, kValidPassphrase));
   ASSERT_TRUE(AwaitPassphraseAccepted(GetSyncService(1)));
 
-  // For some reason, the tests won't pass unless these flags are set.
-  GetSyncService(1)->SetFirstSetupComplete();
-  GetSyncService(1)->SetSetupInProgress(false);
+  // We must mark the setup complete now, since we just entered the passphrase
+  // and the previous SetupSync() call failed.
+  GetClient(1)->FinishSyncSetup();
 
   // Move around some passwords to make sure it's all working.
   PasswordForm form0 = CreateTestPasswordForm(0);
   AddLogin(GetPasswordStore(0), form0);
 
   ASSERT_TRUE(AwaitAllProfilesContainSamePasswordForms());
 }
 
 IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest, E2E_ONLY(Delete)) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
@@ skipping 82 matching lines @@
 
   // Blocks and waits for password forms in all profiles to match.
   ASSERT_TRUE(AwaitAllProfilesContainSamePasswordForms());
 
   // Check that total number of passwords is as expected.
   for (int i = 0; i < num_clients(); ++i) {
     ASSERT_EQ(GetPasswordCount(i), init_password_count + num_clients()) <<
         "Total password count is wrong.";
   }
 }