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

Side by Side Diff: chrome/browser/sync/test/integration/sync_test.h

Issue 2740363002: [Sync] Fix EnableDisableSingleClientTest (Closed)
Patch Set: add {} Created 3 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_TEST_H_ 5 #ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_TEST_H_
6 #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_TEST_H_ 6 #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_TEST_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 25 matching lines...) Expand all
36 // the default DISABLED_test_name macro. To disable it from running as an E2E 36 // the default DISABLED_test_name macro. To disable it from running as an E2E
37 // test outside Chromium waterfalls you would need to remove the E2E* macro. 37 // test outside Chromium waterfalls you would need to remove the E2E* macro.
38 #define MACRO_CONCAT(prefix, test_name) prefix ## _ ## test_name 38 #define MACRO_CONCAT(prefix, test_name) prefix ## _ ## test_name
39 #define E2E_ONLY(test_name) MACRO_CONCAT(DISABLED_E2ETest, test_name) 39 #define E2E_ONLY(test_name) MACRO_CONCAT(DISABLED_E2ETest, test_name)
40 #define E2E_ENABLED(test_name) MACRO_CONCAT(test_name, E2ETest) 40 #define E2E_ENABLED(test_name) MACRO_CONCAT(test_name, E2ETest)
41 41
42 class ProfileSyncServiceHarness; 42 class ProfileSyncServiceHarness;
43 class P2PInvalidationForwarder; 43 class P2PInvalidationForwarder;
44 class P2PSyncRefresher; 44 class P2PSyncRefresher;
45 45
46 namespace arc {
47 class SyncArcPackageHelper;
48 } // namespace arc
49
46 namespace base { 50 namespace base {
47 class CommandLine; 51 class CommandLine;
48 class ScopedTempDir; 52 class ScopedTempDir;
49 } // namespace base 53 } // namespace base
50 54
51 namespace browser_sync { 55 namespace browser_sync {
52 class ProfileSyncService; 56 class ProfileSyncService;
53 } // namespace browser_sync 57 } // namespace browser_sync
54 58
55 namespace fake_server { 59 namespace fake_server {
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 // Triggers the creation the Synced Bookmarks folder on the server. 249 // Triggers the creation the Synced Bookmarks folder on the server.
246 void TriggerCreateSyncedBookmarks(); 250 void TriggerCreateSyncedBookmarks();
247 251
248 // Returns the FakeServer being used for the test or null if FakeServer is 252 // Returns the FakeServer being used for the test or null if FakeServer is
249 // not being used. 253 // not being used.
250 fake_server::FakeServer* GetFakeServer() const; 254 fake_server::FakeServer* GetFakeServer() const;
251 255
252 // Triggers a sync for the given |model_types| for the Profile at |index|. 256 // Triggers a sync for the given |model_types| for the Profile at |index|.
253 void TriggerSyncForModelTypes(int index, syncer::ModelTypeSet model_types); 257 void TriggerSyncForModelTypes(int index, syncer::ModelTypeSet model_types);
254 258
259 arc::SyncArcPackageHelper* sync_arc_helper();
260
255 protected: 261 protected:
256 // Add custom switches needed for running the test. 262 // Add custom switches needed for running the test.
257 virtual void AddTestSwitches(base::CommandLine* cl); 263 virtual void AddTestSwitches(base::CommandLine* cl);
258 264
259 // Append the command line switches to enable experimental types that aren't 265 // Append the command line switches to enable experimental types that aren't
260 // on by default yet. 266 // on by default yet.
261 virtual void AddOptionalTypesToCommandLine(base::CommandLine* cl); 267 virtual void AddOptionalTypesToCommandLine(base::CommandLine* cl);
262 268
263 // BrowserTestBase override. Destroys all the sync clients and sync 269 // BrowserTestBase override. Destroys all the sync clients and sync
264 // profiles created by a test. 270 // profiles created by a test.
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
470 std::unique_ptr<net::URLFetcherImplFactory> factory_; 476 std::unique_ptr<net::URLFetcherImplFactory> factory_;
471 477
472 // The contents to be written to a profile's Preferences file before the 478 // The contents to be written to a profile's Preferences file before the
473 // Profile object is created. If empty, no preexisting file will be written. 479 // Profile object is created. If empty, no preexisting file will be written.
474 std::string preexisting_preferences_file_contents_; 480 std::string preexisting_preferences_file_contents_;
475 481
476 DISALLOW_COPY_AND_ASSIGN(SyncTest); 482 DISALLOW_COPY_AND_ASSIGN(SyncTest);
477 }; 483 };
478 484
479 #endif // CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_TEST_H_ 485 #endif // CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_TEST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698