chrome/test/live_sync/two_client_live_passwords_sync_test.cc - Issue 6462015: Cleanup more test code.

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/test/live_sync/two_client_live_passwords_sync_test.cc

Issue 6462015: Cleanup more test code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: wtf windows is this me Created 9 years, 10 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/test/live_sync/two_client_live_bookmarks_sync_test.cc ('k') | chrome/test/live_sync/two_client_live_preferences_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) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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 "chrome/browser/password_manager/password_form_data.h"	6 #include "chrome/browser/password_manager/password_form_data.h"

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

6 #include "chrome/browser/sync/sessions/session_state.h"	8 #include "chrome/browser/sync/sessions/session_state.h"

7 #include "chrome/test/live_sync/live_passwords_sync_test.h"	9 #include "chrome/test/live_sync/live_passwords_sync_test.h"

8	10

9 using webkit_glue::PasswordForm;	11 using webkit_glue::PasswordForm;

10	12

11 static const char* kValidPassphrase = "passphrase!";	13 static const char* kValidPassphrase = "passphrase!";

12	14

13 // TODO(sync): Remove FAILS_ annotation after http://crbug.com/59867 is fixed.	15 // TODO(sync): Remove FAILS_ annotation after http://crbug.com/59867 is fixed.

14 #if defined(OS_MACOSX)	16 #if defined(OS_MACOSX)

15 IN_PROC_BROWSER_TEST_F(TwoClientLivePasswordsSyncTest, FAILS_Add) {	17 IN_PROC_BROWSER_TEST_F(TwoClientLivePasswordsSyncTest, FAILS_Add) {

(...skipping 139 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
155 ASSERT_TRUE(GetClient(1)->service()->observed_passphrase_required());	157 ASSERT_TRUE(GetClient(1)->service()->observed_passphrase_required());

156	158

157 GetClient(1)->service()->SetPassphrase(kValidPassphrase, true, true);	159 GetClient(1)->service()->SetPassphrase(kValidPassphrase, true, true);

158 GetClient(1)->AwaitPassphraseAccepted();	160 GetClient(1)->AwaitPassphraseAccepted();

159 ASSERT_FALSE(GetClient(1)->service()->observed_passphrase_required());	161 ASSERT_FALSE(GetClient(1)->service()->observed_passphrase_required());

160	162

161 GetClient(1)->service()->SetPassphrase(kValidPassphrase, true, true);	163 GetClient(1)->service()->SetPassphrase(kValidPassphrase, true, true);

162 GetClient(1)->AwaitPassphraseAccepted();	164 GetClient(1)->AwaitPassphraseAccepted();

163 ASSERT_FALSE(GetClient(1)->service()->observed_passphrase_required());	165 ASSERT_FALSE(GetClient(1)->service()->observed_passphrase_required());

164 }	166 }

OLD	NEW