chrome/browser/sync/test/integration/sync_errors_test.cc - Issue 10857031: Move PrefMember and PrefChangeRegistrar to api directory.

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/sync_errors_test.cc

Issue 10857031: Move PrefMember and PrefChangeRegistrar to api directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge to parent Created 8 years, 4 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/sync_prefs.h ('k') | chrome/browser/tab_contents/render_view_context_menu.cc » ('j') | no next file with comments »

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 "chrome/browser/prefs/pref_member.h"	5 #include "chrome/browser/api/prefs/pref_member.h"

6 #include "chrome/browser/prefs/pref_service.h"	6 #include "chrome/browser/prefs/pref_service.h"

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

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

9 #include "chrome/browser/sync/test/integration/bookmarks_helper.h"	9 #include "chrome/browser/sync/test/integration/bookmarks_helper.h"

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

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

12 #include "chrome/common/net/gaia/google_service_auth_error.h"	12 #include "chrome/common/net/gaia/google_service_auth_error.h"

13 #include "chrome/common/pref_names.h"	13 #include "chrome/common/pref_names.h"

14 #include "sync/protocol/sync_protocol_error.h"	14 #include "sync/protocol/sync_protocol_error.h"

15	15

(...skipping 151 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
167	167

168 synced_datatypes = GetClient(0)->service()->GetPreferredDataTypes();	168 synced_datatypes = GetClient(0)->service()->GetPreferredDataTypes();

169 ASSERT_FALSE(synced_datatypes.Has(syncer::TYPED_URLS));	169 ASSERT_FALSE(synced_datatypes.Has(syncer::TYPED_URLS));

170	170

171 const BookmarkNode* node1 = AddFolder(0, 0, L"title1");	171 const BookmarkNode* node1 = AddFolder(0, 0, L"title1");

172 SetTitle(0, node1, L"new_title1");	172 SetTitle(0, node1, L"new_title1");

173 ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion("Sync."));	173 ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion("Sync."));

174 // TODO(lipalani)" Verify initial sync ended for typed url is false.	174 // TODO(lipalani)" Verify initial sync ended for typed url is false.

175 }	175 }

176	176

OLD	NEW