chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc - Issue 16387014: Use a direct include of utf_string_conversions.h in chrome/browser/, part 3.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 16387014: Use a direct include of utf_string_conversions.h in chrome/browser/, part 3. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 6 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

« no previous file with comments | « chrome/browser/sync/test/integration/two_client_autofill_sync_test.cc ('k') | chrome/browser/sync/test/integration/two_client_search_engines_sync_test.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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/strings/utf_string_conversions.h"

6 #include "chrome/browser/sync/profile_sync_service_harness.h"	6 #include "chrome/browser/sync/profile_sync_service_harness.h"

7 #include "chrome/browser/sync/test/integration/passwords_helper.h"	7 #include "chrome/browser/sync/test/integration/passwords_helper.h"

8 #include "chrome/browser/sync/test/integration/sync_test.h"	8 #include "chrome/browser/sync/test/integration/sync_test.h"

9 #include "sync/internal_api/public/engine/model_safe_worker.h"	9 #include "sync/internal_api/public/engine/model_safe_worker.h"

10 #include "sync/internal_api/public/sessions/sync_session_snapshot.h"	10 #include "sync/internal_api/public/sessions/sync_session_snapshot.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;

(...skipping 263 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
279 ASSERT_FALSE(AllProfilesContainSamePasswordFormsAsVerifier());	279 ASSERT_FALSE(AllProfilesContainSamePasswordFormsAsVerifier());

280	280

281 // Update 1 with the correct passphrase, the password should now sync over.	281 // Update 1 with the correct passphrase, the password should now sync over.

282 ASSERT_TRUE(GetClient(1)->AwaitPassphraseRequired());	282 ASSERT_TRUE(GetClient(1)->AwaitPassphraseRequired());

283 ASSERT_TRUE(SetDecryptionPassphrase(1, kValidPassphrase));	283 ASSERT_TRUE(SetDecryptionPassphrase(1, kValidPassphrase));

284 ASSERT_TRUE(GetClient(1)->AwaitPassphraseAccepted());	284 ASSERT_TRUE(GetClient(1)->AwaitPassphraseAccepted());

285	285

286 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));	286 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));

287 ASSERT_TRUE(AllProfilesContainSamePasswordFormsAsVerifier());	287 ASSERT_TRUE(AllProfilesContainSamePasswordFormsAsVerifier());

288 }	288 }

OLD	NEW