Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(491)

Side by Side Diff: chrome/test/live_sync/live_bookmarks_sync_test.h

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
OLDNEW
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 #ifndef CHROME_TEST_LIVE_SYNC_LIVE_BOOKMARKS_SYNC_TEST_H_ 5 #ifndef CHROME_TEST_LIVE_SYNC_LIVE_BOOKMARKS_SYNC_TEST_H_
8 #define CHROME_TEST_LIVE_SYNC_LIVE_BOOKMARKS_SYNC_TEST_H_ 6 #define CHROME_TEST_LIVE_SYNC_LIVE_BOOKMARKS_SYNC_TEST_H_
9 7
10 #include <string> 8 #include <string>
11 9
12 #include "base/command_line.h" 10 #include "base/command_line.h"
13 #include "chrome/common/chrome_paths.h" 11 #include "chrome/common/chrome_paths.h"
14 #include "chrome/common/chrome_switches.h" 12 #include "chrome/common/chrome_switches.h"
15 #include "chrome/test/in_process_browser_test.h" 13 #include "chrome/test/in_process_browser_test.h"
16 #include "googleurl/src/gurl.h" 14 #include "googleurl/src/gurl.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 private: 72 private:
75 // LiveBookmarksSyncTests need to make live DNS requests for access to 73 // LiveBookmarksSyncTests need to make live DNS requests for access to
76 // GAIA and sync server URLs under google.com. We use a scoped version 74 // GAIA and sync server URLs under google.com. We use a scoped version
77 // to override the default resolver while the test is active. 75 // to override the default resolver while the test is active.
78 scoped_ptr<net::ScopedDefaultHostResolverProc> mock_host_resolver_override_; 76 scoped_ptr<net::ScopedDefaultHostResolverProc> mock_host_resolver_override_;
79 77
80 DISALLOW_COPY_AND_ASSIGN(LiveBookmarksSyncTest); 78 DISALLOW_COPY_AND_ASSIGN(LiveBookmarksSyncTest);
81 }; 79 };
82 80
83 #endif // CHROME_TEST_SYNC_LIVE_BOOKMARKS_SYNC_TEST_H_ 81 #endif // CHROME_TEST_SYNC_LIVE_BOOKMARKS_SYNC_TEST_H_
84
85 #endif // defined(BROWSER_SYNC)
OLDNEW
« no previous file with comments | « chrome/test/live_sync/bookmark_model_verifier.cc ('k') | chrome/test/live_sync/live_bookmarks_sync_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698