chrome/test/live_sync/single_client_live_bookmarks_sync_unittest.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/single_client_live_bookmarks_sync_unittest.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

« no previous file with comments | « chrome/test/live_sync/profile_sync_service_test_harness.cc ('k') | chrome/test/live_sync/two_client_live_bookmarks_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) 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 "base/command_line.h"	5 #include "base/command_line.h"

8 #include "chrome/browser/bookmarks/bookmark_model.h"	6 #include "chrome/browser/bookmarks/bookmark_model.h"

9 #include "chrome/browser/browser.h"	7 #include "chrome/browser/browser.h"

10 #include "chrome/browser/profile.h"	8 #include "chrome/browser/profile.h"

11 #include "chrome/browser/sync/profile_sync_service.h"	9 #include "chrome/browser/sync/profile_sync_service.h"

12 #include "chrome/test/live_sync/bookmark_model_verifier.h"	10 #include "chrome/test/live_sync/bookmark_model_verifier.h"

13 #include "chrome/test/live_sync/profile_sync_service_test_harness.h"	11 #include "chrome/test/live_sync/profile_sync_service_test_harness.h"

14 #include "chrome/test/live_sync/live_bookmarks_sync_test.h"	12 #include "chrome/test/live_sync/live_bookmarks_sync_test.h"

15	13

16 class SingleClientLiveBookmarksSyncTest : public LiveBookmarksSyncTest {	14 class SingleClientLiveBookmarksSyncTest : public LiveBookmarksSyncTest {

(...skipping 128 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
145 // 'Bookmarks' file. This is mostly useful to verify server state.	143 // 'Bookmarks' file. This is mostly useful to verify server state.

146 // DISABLED because it should be; we use this as a utility more than a test.	144 // DISABLED because it should be; we use this as a utility more than a test.

147 IN_PROC_BROWSER_TEST_F(SingleClientLiveBookmarksSyncTest, DISABLED_GetUpdates) {	145 IN_PROC_BROWSER_TEST_F(SingleClientLiveBookmarksSyncTest, DISABLED_GetUpdates) {

148 ASSERT_TRUE(SetupSync()) << "Failed to SetupSync";	146 ASSERT_TRUE(SetupSync()) << "Failed to SetupSync";

149 BlockUntilLoaded(browser()->profile()->GetBookmarkModel());	147 BlockUntilLoaded(browser()->profile()->GetBookmarkModel());

150 EXPECT_TRUE(client()->ServiceIsPushingChanges());	148 EXPECT_TRUE(client()->ServiceIsPushingChanges());

151 ProfileSyncService::Status status(service()->QueryDetailedSyncStatus());	149 ProfileSyncService::Status status(service()->QueryDetailedSyncStatus());

152 EXPECT_EQ(status.summary, ProfileSyncService::Status::READY);	150 EXPECT_EQ(status.summary, ProfileSyncService::Status::READY);

153 EXPECT_EQ(status.unsynced_count, 0);	151 EXPECT_EQ(status.unsynced_count, 0);

154 }	152 }

155

156 #endif // defined(BROWSER_SYNC)

OLD	NEW