chrome/test/live_sync/two_client_live_bookmarks_sync_test.cc - Issue 337034: Remove the browser_sync flag.

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_bookmarks_sync_test.cc

Issue 337034: Remove the browser_sync flag. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 11 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

OLD	NEW
1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2006-2009 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 #if defined(BROWSER_SYNC)

6

7 #include <stdlib.h>	5 #include <stdlib.h>

8	6

9 #include "base/string16.h"	7 #include "base/string16.h"

10 #include "base/rand_util.h"	8 #include "base/rand_util.h"

11 #include "chrome/browser/bookmarks/bookmark_model.h"	9 #include "chrome/browser/bookmarks/bookmark_model.h"

12 #include "chrome/browser/bookmarks/bookmark_utils.h"	10 #include "chrome/browser/bookmarks/bookmark_utils.h"

13 #include "chrome/browser/browser.h"	11 #include "chrome/browser/browser.h"

14 #include "chrome/browser/profile.h"	12 #include "chrome/browser/profile.h"

15 #include "chrome/browser/sync/profile_sync_service.h"	13 #include "chrome/browser/sync/profile_sync_service.h"

16 #include "chrome/test/live_sync/bookmark_model_verifier.h"	14 #include "chrome/test/live_sync/bookmark_model_verifier.h"

(...skipping 2459 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
2476 // Wait for changes to propagate.	2474 // Wait for changes to propagate.

2477 ASSERT_TRUE(client2()->AwaitMutualSyncCycleCompletion(client1()));	2475 ASSERT_TRUE(client2()->AwaitMutualSyncCycleCompletion(client1()));

2478 // Let's make sure there aren't any duplicates after sync.	2476 // Let's make sure there aren't any duplicates after sync.

2479 BookmarkModelVerifier::VerifyNoDuplicates(model_one);	2477 BookmarkModelVerifier::VerifyNoDuplicates(model_one);

2480 // Let's compare and make sure both bookmark models are same after sync.	2478 // Let's compare and make sure both bookmark models are same after sync.

2481 BookmarkModelVerifier::ExpectModelsMatchIncludingFavicon(	2479 BookmarkModelVerifier::ExpectModelsMatchIncludingFavicon(

2482 model_one, model_two, false);	2480 model_one, model_two, false);

2483	2481

2484 Cleanup();	2482 Cleanup();

2485 }	2483 }

2486

2487

2488 #endif // defined(BROWSER_SYNC)

OLD	NEW

« no previous file with comments | « chrome/test/live_sync/single_client_live_bookmarks_sync_unittest.cc ('k') | chrome/test/sync/test_http_bridge_factory.h » ('j') | no next file with comments »