chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc - Issue 9699057: [Sync] Move 'sync' target to 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/two_client_bookmarks_sync_test.cc

Issue 9699057: [Sync] Move 'sync' target to sync/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address Tim's comments Created 8 years, 9 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/sync_test.h ('k') | chrome/browser/sync/test/integration/two_client_passwords_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/rand_util.h"	5 #include "base/rand_util.h"

6 #include "chrome/browser/profiles/profile.h"	6 #include "chrome/browser/profiles/profile.h"

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

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

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

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

	10 #include "sync/sessions/session_state.h"

11	11

12 using bookmarks_helper::AddFolder;	12 using bookmarks_helper::AddFolder;

13 using bookmarks_helper::AddURL;	13 using bookmarks_helper::AddURL;

14 using bookmarks_helper::AllModelsMatch;	14 using bookmarks_helper::AllModelsMatch;

15 using bookmarks_helper::AllModelsMatchVerifier;	15 using bookmarks_helper::AllModelsMatchVerifier;

16 using bookmarks_helper::ContainsDuplicateBookmarks;	16 using bookmarks_helper::ContainsDuplicateBookmarks;

17 using bookmarks_helper::CountBookmarksWithTitlesMatching;	17 using bookmarks_helper::CountBookmarksWithTitlesMatching;

18 using bookmarks_helper::CreateFavicon;	18 using bookmarks_helper::CreateFavicon;

19 using bookmarks_helper::GetBookmarkBarNode;	19 using bookmarks_helper::GetBookmarkBarNode;

20 using bookmarks_helper::GetOtherNode;	20 using bookmarks_helper::GetOtherNode;

(...skipping 1893 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1914 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));	1914 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));

1915 ASSERT_TRUE(AllModelsMatchVerifier());	1915 ASSERT_TRUE(AllModelsMatchVerifier());

1916	1916

1917 RestartSyncService(0);	1917 RestartSyncService(0);

1918 ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion("Restarted sync."));	1918 ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion("Restarted sync."));

1919 ASSERT_TRUE(AllModelsMatchVerifier());	1919 ASSERT_TRUE(AllModelsMatchVerifier());

1920 ASSERT_EQ(ProfileSyncService::Status::READY,	1920 ASSERT_EQ(ProfileSyncService::Status::READY,

1921 GetClient(0)->GetStatus().summary);	1921 GetClient(0)->GetStatus().summary);

1922 ASSERT_EQ(0, GetClient(0)->GetStatus().unsynced_count);	1922 ASSERT_EQ(0, GetClient(0)->GetStatus().unsynced_count);

1923 }	1923 }

OLD	NEW