OLD | NEW |
---|---|
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 21 matching lines...) Expand all Loading... | |
32 // - E2E_ENABLED: Marks a test to run as an E2E test in addition to Chromium | 32 // - E2E_ENABLED: Marks a test to run as an E2E test in addition to Chromium |
33 // waterfalls. | 33 // waterfalls. |
34 // | 34 // |
35 // To disable a test from running on Chromium waterfalls, you would still use | 35 // To disable a test from running on Chromium waterfalls, you would still use |
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 ProfileSyncService; | |
43 class ProfileSyncServiceHarness; | 42 class ProfileSyncServiceHarness; |
44 class P2PInvalidationForwarder; | 43 class P2PInvalidationForwarder; |
45 class P2PSyncRefresher; | 44 class P2PSyncRefresher; |
46 | 45 |
47 namespace base { | 46 namespace base { |
48 class CommandLine; | 47 class CommandLine; |
49 class ScopedTempDir; | 48 class ScopedTempDir; |
50 } | 49 } |
skym
2016/09/22 17:25:58
Closing namespaces.
maxbogue
2016/09/22 19:41:14
Done.
| |
51 | 50 |
51 namespace browser_sync { | |
52 class ProfileSyncService; | |
53 } | |
54 | |
52 namespace fake_server { | 55 namespace fake_server { |
53 class FakeServer; | 56 class FakeServer; |
54 class FakeServerInvalidationService; | 57 class FakeServerInvalidationService; |
55 } | 58 } |
56 | 59 |
57 namespace net { | 60 namespace net { |
58 class FakeURLFetcherFactory; | 61 class FakeURLFetcherFactory; |
59 class ScopedDefaultHostResolverProc; | 62 class ScopedDefaultHostResolverProc; |
60 class URLFetcherImplFactory; | 63 class URLFetcherImplFactory; |
61 class URLRequestContextGetter; | 64 class URLRequestContextGetter; |
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
142 // and manages its lifetime. | 145 // and manages its lifetime. |
143 ProfileSyncServiceHarness* GetClient(int index) WARN_UNUSED_RESULT; | 146 ProfileSyncServiceHarness* GetClient(int index) WARN_UNUSED_RESULT; |
144 | 147 |
145 // Returns a reference to the collection of sync clients. Callee owns the | 148 // Returns a reference to the collection of sync clients. Callee owns the |
146 // object and manages its lifetime. | 149 // object and manages its lifetime. |
147 std::vector<ProfileSyncServiceHarness*>& clients() WARN_UNUSED_RESULT { | 150 std::vector<ProfileSyncServiceHarness*>& clients() WARN_UNUSED_RESULT { |
148 return clients_.get(); | 151 return clients_.get(); |
149 } | 152 } |
150 | 153 |
151 // Returns a ProfileSyncService at the given index. | 154 // Returns a ProfileSyncService at the given index. |
152 ProfileSyncService* GetSyncService(int index); | 155 browser_sync::ProfileSyncService* GetSyncService(int index); |
153 | 156 |
154 // Returns the set of ProfileSyncServices. | 157 // Returns the set of ProfileSyncServices. |
155 std::vector<ProfileSyncService*> GetSyncServices(); | 158 std::vector<browser_sync::ProfileSyncService*> GetSyncServices(); |
156 | 159 |
157 // Returns a pointer to the sync profile that is used to verify changes to | 160 // Returns a pointer to the sync profile that is used to verify changes to |
158 // individual sync profiles. Callee owns the object and manages its lifetime. | 161 // individual sync profiles. Callee owns the object and manages its lifetime. |
159 Profile* verifier() WARN_UNUSED_RESULT; | 162 Profile* verifier() WARN_UNUSED_RESULT; |
160 | 163 |
161 // Used to determine whether the verifier profile should be updated or not. | 164 // Used to determine whether the verifier profile should be updated or not. |
162 bool use_verifier() WARN_UNUSED_RESULT { return use_verifier_; } | 165 bool use_verifier() WARN_UNUSED_RESULT { return use_verifier_; } |
163 | 166 |
164 // After calling this method, changes made to a profile will no longer be | 167 // After calling this method, changes made to a profile will no longer be |
165 // reflected in the verifier profile. Note: Not all datatypes use this. | 168 // reflected in the verifier profile. Note: Not all datatypes use this. |
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
456 std::unique_ptr<net::URLFetcherImplFactory> factory_; | 459 std::unique_ptr<net::URLFetcherImplFactory> factory_; |
457 | 460 |
458 // The contents to be written to a profile's Preferences file before the | 461 // The contents to be written to a profile's Preferences file before the |
459 // Profile object is created. If empty, no preexisting file will be written. | 462 // Profile object is created. If empty, no preexisting file will be written. |
460 std::string preexisting_preferences_file_contents_; | 463 std::string preexisting_preferences_file_contents_; |
461 | 464 |
462 DISALLOW_COPY_AND_ASSIGN(SyncTest); | 465 DISALLOW_COPY_AND_ASSIGN(SyncTest); |
463 }; | 466 }; |
464 | 467 |
465 #endif // CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_TEST_H_ | 468 #endif // CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_TEST_H_ |
OLD | NEW |