Fix flakiness of ShouldCompleteKeystoreInitializationAfterRestart

FakeServer state isn't restored after pre-test, so commit error isn't
set in the beginning of main test. It means that we can't assert server
Nigori to have implicit passphrase type after SetupClients() call.

Bug: 1021539
Change-Id: If1cae01f3c66c8f569023bd5055e3dbd2a76d3f8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1899776Reviewed-by: Mikel Astiz <mastiz@chromium.org>
Commit-Queue: Mikel Astiz <mastiz@chromium.org>
Auto-Submit: Maksim Moskvitin <mmoskvitin@google.com>
Cr-Commit-Position: refs/heads/master@{#712611}

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

@@ -370,16 +370,22 @@ IN_PROC_BROWSER_TEST_P(SingleClientNigoriSyncTestWithNotAwaitQuiescence,
                        PRE_ShouldCompleteKeystoreInitializationAfterRestart) {
   GetFakeServer()->TriggerCommitError(sync_pb::SyncEnums::THROTTLED);
   ASSERT_TRUE(SetupSync());
+
+  sync_pb::NigoriSpecifics specifics;
+  ASSERT_TRUE(GetServerNigori(GetFakeServer(), &specifics));
+  ASSERT_EQ(specifics.passphrase_type(),
+            sync_pb::NigoriSpecifics::IMPLICIT_PASSPHRASE);
 }
 
 // After browser restart the client should commit initialized Nigori.
 IN_PROC_BROWSER_TEST_P(SingleClientNigoriSyncTestWithNotAwaitQuiescence,
                        ShouldCompleteKeystoreInitializationAfterRestart) {
+  sync_pb::NigoriSpecifics specifics;
+  ASSERT_TRUE(GetServerNigori(GetFakeServer(), &specifics));
+  ASSERT_EQ(specifics.passphrase_type(),
+            sync_pb::NigoriSpecifics::IMPLICIT_PASSPHRASE);
+
   ASSERT_TRUE(SetupClients());
-  ASSERT_TRUE(ServerNigoriChecker(GetSyncService(0), GetFakeServer(),
-                                  syncer::PassphraseType::kImplicitPassphrase)
-                  .Wait());
-  GetFakeServer()->TriggerCommitError(sync_pb::SyncEnums::SUCCESS);
   EXPECT_TRUE(ServerNigoriChecker(GetSyncService(0), GetFakeServer(),
                                   syncer::PassphraseType::kKeystorePassphrase)
                   .Wait());