chrome/test/live_sync/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/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 #if defined(BROWSER_SYNC)

5	4

6 #include "chrome/test/live_sync/live_bookmarks_sync_test.h"	5 #include "chrome/test/live_sync/live_bookmarks_sync_test.h"

7	6

8 #include <vector>	7 #include <vector>

9	8

10 #include "base/command_line.h"	9 #include "base/command_line.h"

11 #include "base/file_util.h"	10 #include "base/file_util.h"

12 #include "base/path_service.h"	11 #include "base/path_service.h"

13 #include "chrome/browser/bookmarks/bookmark_model.h"	12 #include "chrome/browser/bookmarks/bookmark_model.h"

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

(...skipping 73 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
88 net::RuleBasedHostResolverProc* resolver =	87 net::RuleBasedHostResolverProc* resolver =

89 new net::RuleBasedHostResolverProc(host_resolver());	88 new net::RuleBasedHostResolverProc(host_resolver());

90 resolver->AllowDirectLookup("*.google.com");	89 resolver->AllowDirectLookup("*.google.com");

91 mock_host_resolver_override_.reset(	90 mock_host_resolver_override_.reset(

92 new net::ScopedDefaultHostResolverProc(resolver));	91 new net::ScopedDefaultHostResolverProc(resolver));

93 }	92 }

94	93

95 void LiveBookmarksSyncTest::TearDownInProcessBrowserTestFixture() {	94 void LiveBookmarksSyncTest::TearDownInProcessBrowserTestFixture() {

96 mock_host_resolver_override_.reset();	95 mock_host_resolver_override_.reset();

97 }	96 }

98

99 #endif // defined(BROWSER_SYNC)

OLD	NEW

« no previous file with comments | « chrome/test/live_sync/live_bookmarks_sync_test.h ('k') | chrome/test/live_sync/profile_sync_service_test_harness.h » ('j') | no next file with comments »