[Sync] Removed passphrase helper methods, removed ((n)) pattern, and fixed lint violations.

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 13 matching lines @@
 using passwords_helper::AllProfilesContainSamePasswordFormsAsVerifier;
 using passwords_helper::AwaitAllProfilesContainSamePasswordForms;
 using passwords_helper::AwaitProfileContainsSamePasswordFormsAsVerifier;
 using passwords_helper::CreateTestPasswordForm;
 using passwords_helper::GetPasswordCount;
 using passwords_helper::GetPasswordStore;
 using passwords_helper::GetVerifierPasswordCount;
 using passwords_helper::GetVerifierPasswordStore;
 using passwords_helper::RemoveLogin;
 using passwords_helper::RemoveLogins;
-using passwords_helper::SetDecryptionPassphrase;
-using passwords_helper::SetEncryptionPassphrase;
 using passwords_helper::UpdateLogin;
 using sync_integration_test_util::AwaitPassphraseAccepted;
 using sync_integration_test_util::AwaitPassphraseRequired;
 
 using autofill::PasswordForm;
 
 static const char* kValidPassphrase = "passphrase!";
 
 class TwoClientPasswordsSyncTest : public SyncTest {
  public:
@@ skipping 32 matching lines @@
 
   ASSERT_TRUE(AwaitAllProfilesContainSamePasswordForms());
 }
 
 IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest,
                        E2E_ENABLED(SetPassphraseAndAddPassword)) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   SetEncryptionPassphrase(0, kValidPassphrase,
                           browser_sync::ProfileSyncService::EXPLICIT);
-  ASSERT_TRUE(AwaitPassphraseAccepted(GetSyncService((0))));
+  ASSERT_TRUE(AwaitPassphraseAccepted(GetSyncService(0)));
 
-  ASSERT_TRUE(AwaitPassphraseRequired(GetSyncService((1))));
+  ASSERT_TRUE(AwaitPassphraseRequired(GetSyncService(1)));
   ASSERT_TRUE(SetDecryptionPassphrase(1, kValidPassphrase));
-  ASSERT_TRUE(AwaitPassphraseAccepted(GetSyncService((1))));
+  ASSERT_TRUE(AwaitPassphraseAccepted(GetSyncService(1)));
 
   PasswordForm form = CreateTestPasswordForm(0);
   AddLogin(GetPasswordStore(0), form);
   ASSERT_EQ(1, GetPasswordCount(0));
 
   ASSERT_TRUE(AwaitAllProfilesContainSamePasswordForms());
 }
 
 // TCM ID - 4603879
 IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest, Update) {
@@ skipping 157 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.";
   }
 }