Moved the handling of the initial passphrase into SyncSetupFlow.

chrome/test/live_sync/two_client_sessions_sync_test.cc

Index: chrome/test/live_sync/two_client_sessions_sync_test.cc
diff --git a/chrome/test/live_sync/two_client_sessions_sync_test.cc b/chrome/test/live_sync/two_client_sessions_sync_test.cc
index 748a7eb3361d4996cc956547d656b0b816fec72a..453c51b8d2ea35c44e263e2e21fe1c3116ea8f64 100644
--- a/chrome/test/live_sync/two_client_sessions_sync_test.cc
+++ b/chrome/test/live_sync/two_client_sessions_sync_test.cc
@@ -141,7 +141,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest,
   ASSERT_TRUE(OpenTabAndGetLocalWindows(0, GURL(kURL1), client0_windows.get()));
 
   ASSERT_TRUE(EnableEncryption(0, syncable::SESSIONS));
-  GetClient(0)->service()->SetPassphrase(kValidPassphrase, true, true);
+  GetClient(0)->service()->SetPassphrase(kValidPassphrase, true);
   ASSERT_TRUE(GetClient(0)->AwaitPassphraseAccepted());
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(GetClient(1)->AwaitPassphraseRequired());
@@ -152,7 +152,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest,
   ASSERT_EQ(3, GetClient(1)->GetLastSessionSnapshot()->
       num_conflicting_updates);  // The encrypted nodes.
 
-  GetClient(1)->service()->SetPassphrase(kValidPassphrase, true, true);
+  GetClient(1)->service()->SetPassphrase(kValidPassphrase, true);
   ASSERT_TRUE(GetClient(1)->AwaitPassphraseAccepted());
   ASSERT_TRUE(GetClient(1)->WaitForTypeEncryption(syncable::SESSIONS));
 
@@ -177,7 +177,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest,
   ASSERT_TRUE(CheckInitialState(1));
 
   ASSERT_TRUE(EnableEncryption(0, syncable::SESSIONS));
-  GetClient(0)->service()->SetPassphrase(kValidPassphrase, true, true);
+  GetClient(0)->service()->SetPassphrase(kValidPassphrase, true);
   ASSERT_TRUE(GetClient(0)->AwaitPassphraseAccepted());
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(GetClient(1)->AwaitPassphraseRequired());
@@ -196,7 +196,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest,
   ASSERT_EQ(3, GetClient(1)->GetLastSessionSnapshot()->
       num_conflicting_updates);  // The encrypted nodes.
 
-  GetClient(1)->service()->SetPassphrase(kValidPassphrase, true, true);
+  GetClient(1)->service()->SetPassphrase(kValidPassphrase, true);
   ASSERT_TRUE(GetClient(1)->AwaitPassphraseAccepted());
   ASSERT_TRUE(GetClient(1)->WaitForTypeEncryption(syncable::SESSIONS));
 
@@ -220,7 +220,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest,
   ASSERT_TRUE(CheckInitialState(1));
 
   ASSERT_TRUE(EnableEncryption(0, syncable::SESSIONS));
-  GetClient(0)->service()->SetPassphrase(kValidPassphrase, true, true);
+  GetClient(0)->service()->SetPassphrase(kValidPassphrase, true);
   ASSERT_TRUE(GetClient(0)->AwaitPassphraseAccepted());
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(GetClient(1)->AwaitPassphraseRequired());
@@ -243,7 +243,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest,
 
   // At this point we enter the passphrase, triggering a resync, in which the
   // local changes of client 1 get overwritten for now.
-  GetClient(1)->service()->SetPassphrase(kValidPassphrase, true, true);
+  GetClient(1)->service()->SetPassphrase(kValidPassphrase, true);
   ASSERT_TRUE(GetClient(1)->AwaitPassphraseAccepted());
   ASSERT_TRUE(GetClient(1)->WaitForTypeEncryption(syncable::SESSIONS));
 
@@ -273,7 +273,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest,
   // Turn encryption on client 0. Client 1's foreign will be encrypted with the
   // new passphrase and synced back. It will be unable to decrypt it yet.
   ASSERT_TRUE(EnableEncryption(0, syncable::SESSIONS));
-  GetClient(0)->service()->SetPassphrase(kValidPassphrase, true, true);
+  GetClient(0)->service()->SetPassphrase(kValidPassphrase, true);
   ASSERT_TRUE(GetClient(0)->AwaitPassphraseAccepted());
   ASSERT_TRUE(AwaitQuiescence());
   ASSERT_TRUE(GetClient(1)->AwaitPassphraseRequired());
@@ -285,7 +285,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest,
       num_conflicting_updates);  // The encrypted nodes.
 
   // At this point we enter the passphrase, triggering a resync.
-  GetClient(1)->service()->SetPassphrase(kValidPassphrase, true, true);
+  GetClient(1)->service()->SetPassphrase(kValidPassphrase, true);
   ASSERT_TRUE(GetClient(1)->AwaitPassphraseAccepted());
   ASSERT_TRUE(GetClient(1)->WaitForTypeEncryption(syncable::SESSIONS));
 
@@ -308,7 +308,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest,
   ASSERT_TRUE(CheckInitialState(0));
   ASSERT_TRUE(CheckInitialState(1));
 
-  GetClient(0)->service()->SetPassphrase(kValidPassphrase, true, true);
+  GetClient(0)->service()->SetPassphrase(kValidPassphrase, true);
   ASSERT_TRUE(GetClient(0)->AwaitPassphraseAccepted());
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(GetClient(1)->AwaitPassphraseRequired());
@@ -326,7 +326,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest,
   ASSERT_EQ(3, GetClient(1)->GetLastSessionSnapshot()->
       num_conflicting_updates);  // The encrypted nodes.
 
-  GetClient(1)->service()->SetPassphrase(kValidPassphrase, true, true);
+  GetClient(1)->service()->SetPassphrase(kValidPassphrase, true);
   ASSERT_TRUE(GetClient(1)->AwaitPassphraseAccepted());
   ASSERT_FALSE(GetClient(1)->service()->IsPassphraseRequired());
   ASSERT_TRUE(GetClient(1)->WaitForTypeEncryption(syncable::SESSIONS));