Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(502)

Side by Side Diff: chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc

Issue 9699057: [Sync] Move 'sync' target to sync/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address Tim's comments Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/utf_string_conversions.h" 5 #include "base/utf_string_conversions.h"
6 #include "chrome/browser/sync/engine/model_safe_worker.h"
7 #include "chrome/browser/sync/profile_sync_service_harness.h" 6 #include "chrome/browser/sync/profile_sync_service_harness.h"
8 #include "chrome/browser/sync/sessions/session_state.h" 7 #include "chrome/browser/sync/test/integration/passwords_helper.h"
9 #include "chrome/browser/sync/test/integration/sync_test.h" 8 #include "chrome/browser/sync/test/integration/sync_test.h"
10 #include "chrome/browser/sync/test/integration/passwords_helper.h" 9 #include "sync/engine/model_safe_worker.h"
10 #include "sync/sessions/session_state.h"
11 11
12 using passwords_helper::AddLogin; 12 using passwords_helper::AddLogin;
13 using passwords_helper::AllProfilesContainSamePasswordForms; 13 using passwords_helper::AllProfilesContainSamePasswordForms;
14 using passwords_helper::AllProfilesContainSamePasswordFormsAsVerifier; 14 using passwords_helper::AllProfilesContainSamePasswordFormsAsVerifier;
15 using passwords_helper::CreateTestPasswordForm; 15 using passwords_helper::CreateTestPasswordForm;
16 using passwords_helper::GetPasswordCount; 16 using passwords_helper::GetPasswordCount;
17 using passwords_helper::GetPasswordStore; 17 using passwords_helper::GetPasswordStore;
18 using passwords_helper::GetVerifierPasswordCount; 18 using passwords_helper::GetVerifierPasswordCount;
19 using passwords_helper::GetVerifierPasswordStore; 19 using passwords_helper::GetVerifierPasswordStore;
20 using passwords_helper::ProfileContainsSamePasswordFormsAsVerifier; 20 using passwords_helper::ProfileContainsSamePasswordFormsAsVerifier;
(...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 // Password hasn't been synced to 1 yet. 273 // Password hasn't been synced to 1 yet.
274 ASSERT_FALSE(AllProfilesContainSamePasswordFormsAsVerifier()); 274 ASSERT_FALSE(AllProfilesContainSamePasswordFormsAsVerifier());
275 275
276 // Update 1 with the correct passphrase, the password should now sync over. 276 // Update 1 with the correct passphrase, the password should now sync over.
277 SetPassphrase(1, kValidPassphrase); 277 SetPassphrase(1, kValidPassphrase);
278 ASSERT_TRUE(GetClient(1)->AwaitPassphraseAccepted()); 278 ASSERT_TRUE(GetClient(1)->AwaitPassphraseAccepted());
279 279
280 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); 280 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
281 ASSERT_TRUE(AllProfilesContainSamePasswordFormsAsVerifier()); 281 ASSERT_TRUE(AllProfilesContainSamePasswordFormsAsVerifier());
282 } 282 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698