[Sync] Fix namespaces for the browser_sync component.

chrome/browser/sync/test/integration/sync_test.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_TEST_H_
 #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_TEST_H_
 
 #include <memory>
 #include <string>
 #include <vector>
@@ skipping 21 matching lines @@
 // - E2E_ENABLED: Marks a test to run as an E2E test in addition to Chromium
 //                waterfalls.
 //
 // To disable a test from running on Chromium waterfalls, you would still use
 // the default DISABLED_test_name macro. To disable it from running as an E2E
 // test outside Chromium waterfalls you would need to remove the E2E* macro.
 #define MACRO_CONCAT(prefix, test_name) prefix ## _ ## test_name
 #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;
 
 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
 // using the IN_PROC_BROWSER_TEST_F macro.
 class SyncTest : public InProcessBrowserTest {
  public:
   // The different types of live sync tests that can be implemented.
   enum TestType {
     // Tests where only one client profile is synced with the server. Typically
     // sanity level tests.
@@ skipping 69 matching lines @@
   // and manages its lifetime.
   ProfileSyncServiceHarness* GetClient(int index) WARN_UNUSED_RESULT;
 
   // Returns a reference to the collection of sync clients. Callee owns the
   // object and manages its lifetime.
   std::vector<ProfileSyncServiceHarness*>& clients() WARN_UNUSED_RESULT {
     return clients_.get();
   }
 
   // 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.
   Profile* verifier() WARN_UNUSED_RESULT;
 
   // Used to determine whether the verifier profile should be updated or not.
   bool use_verifier() WARN_UNUSED_RESULT { return use_verifier_; }
 
   // After calling this method, changes made to a profile will no longer be
   // reflected in the verifier profile. Note: Not all datatypes use this.
@@ skipping 290 matching lines @@
   std::unique_ptr<net::URLFetcherImplFactory> factory_;
 
   // The contents to be written to a profile's Preferences file before the
   // Profile object is created. If empty, no preexisting file will be written.
   std::string preexisting_preferences_file_contents_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncTest);
 };
 
 #endif  // CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_TEST_H_