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

Unified Diff: chrome/browser/sync/test/integration/sync_test.h

Issue 2354613002: [Sync] Fix namespaces for the browser_sync component. (Closed)
Patch Set: Address comments. Created 4 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/test/integration/sync_test.h
diff --git a/chrome/browser/sync/test/integration/sync_test.h b/chrome/browser/sync/test/integration/sync_test.h
index dd6a5f1eef08a4b0cd48363525f5915a33b3c01a..6ba2eb3dc13bfe1399459f6be2b97d5f55191f84 100644
--- a/chrome/browser/sync/test/integration/sync_test.h
+++ b/chrome/browser/sync/test/integration/sync_test.h
@@ -39,7 +39,6 @@
#define E2E_ONLY(test_name) MACRO_CONCAT(DISABLED_E2ETest, test_name)
#define E2E_ENABLED(test_name) MACRO_CONCAT(test_name, E2ETest)
-class ProfileSyncService;
class ProfileSyncServiceHarness;
class P2PInvalidationForwarder;
class P2PSyncRefresher;
@@ -47,19 +46,23 @@ class P2PSyncRefresher;
namespace base {
class CommandLine;
class ScopedTempDir;
-}
+} // namespace base
+
+namespace browser_sync {
+class ProfileSyncService;
+} // namespace browser_sync
namespace fake_server {
class FakeServer;
class FakeServerInvalidationService;
-}
+} // namespace fake_server
namespace net {
class FakeURLFetcherFactory;
class ScopedDefaultHostResolverProc;
class URLFetcherImplFactory;
class URLRequestContextGetter;
-}
+} // namespace net
// This is the base class for integration tests for all sync data types. Derived
// classes must be defined for each sync data type. Individual tests are defined
@@ -149,10 +152,10 @@ class SyncTest : public InProcessBrowserTest {
}
// Returns a ProfileSyncService at the given index.
- ProfileSyncService* GetSyncService(int index);
+ browser_sync::ProfileSyncService* GetSyncService(int index);
// Returns the set of ProfileSyncServices.
- std::vector<ProfileSyncService*> GetSyncServices();
+ std::vector<browser_sync::ProfileSyncService*> GetSyncServices();
// Returns a pointer to the sync profile that is used to verify changes to
// individual sync profiles. Callee owns the object and manages its lifetime.
« no previous file with comments | « chrome/browser/sync/test/integration/sync_integration_test_util.cc ('k') | chrome/browser/sync/test/integration/sync_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698