chrome/browser/sync/test/integration/migration_errors_test.cc - Issue 8470005: Add OVERRIDE to chrome/browser/sync/.

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

Issue 8470005: Add OVERRIDE to chrome/browser/sync/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: includes Created 9 years, 1 month 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/bookmarks_helper.cc ('k') | chrome/browser/sync/test/integration/sync_test.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 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 // TODO(akalin): Rename this file to migration_test.cc.	5 // TODO(akalin): Rename this file to migration_test.cc.

6	6

	7 #include "base/compiler_specific.h"

7 #include "chrome/browser/prefs/scoped_user_pref_update.h"	8 #include "chrome/browser/prefs/scoped_user_pref_update.h"

8 #include "chrome/browser/profiles/profile.h"	9 #include "chrome/browser/profiles/profile.h"

9 #include "chrome/browser/sync/profile_sync_service_harness.h"	10 #include "chrome/browser/sync/profile_sync_service_harness.h"

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

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

12 #include "chrome/browser/sync/test/integration/preferences_helper.h"	13 #include "chrome/browser/sync/test/integration/preferences_helper.h"

13 #include "chrome/browser/translate/translate_prefs.h"	14 #include "chrome/browser/translate/translate_prefs.h"

14 #include "chrome/common/pref_names.h"	15 #include "chrome/common/pref_names.h"

15 #include "chrome/test/base/ui_test_utils.h"	16 #include "chrome/test/base/ui_test_utils.h"

16	17

(...skipping 430 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
447	448

448 // Phase 5: Verify that preferences can still be synchronized.	449 // Phase 5: Verify that preferences can still be synchronized.

449 VerifyPrefSync();	450 VerifyPrefSync();

450	451

451 // Phase 6: Verify that sessions are registered and enabled.	452 // Phase 6: Verify that sessions are registered and enabled.

452 ASSERT_TRUE(GetClient(0)->IsTypeRunning(syncable::SESSIONS));	453 ASSERT_TRUE(GetClient(0)->IsTypeRunning(syncable::SESSIONS));

453 ASSERT_TRUE(GetClient(0)->IsTypePreferred(syncable::SESSIONS));	454 ASSERT_TRUE(GetClient(0)->IsTypePreferred(syncable::SESSIONS));

454 }	455 }

455	456

456 } // namespace	457 } // namespace

OLD	NEW