Revert of [Sync] Move //components/sync to the syncer namespace. (patchset #5 id:40001 of https://co

chrome/browser/sync/profile_sync_service_android.h

Index: chrome/browser/sync/profile_sync_service_android.h
diff --git a/chrome/browser/sync/profile_sync_service_android.h b/chrome/browser/sync/profile_sync_service_android.h
index 12dc4aa50511cced906a38c240022129e3595598..dd8a032a13b6215a463c4328237a75e3914e10bf 100644
--- a/chrome/browser/sync/profile_sync_service_android.h
+++ b/chrome/browser/sync/profile_sync_service_android.h
@@ -8,7 +8,6 @@
 #include <jni.h>
 
 #include <map>
-#include <memory>
 
 #include "base/android/jni_weak_ref.h"
 #include "base/callback.h"
@@ -27,7 +26,7 @@ namespace browser_sync {
 class ProfileSyncService;
 }
 
-namespace syncer {
+namespace sync_driver {
 class SyncSetupInProgressHandle;
 }
 
@@ -36,8 +35,9 @@ class SyncSetupInProgressHandle;
 // a single instance of this wrapper. The name of the Java class is
 // ProfileSyncService.
 // This class should only be accessed from the UI thread.
-class ProfileSyncServiceAndroid : public syncer::SyncServiceObserver {
+class ProfileSyncServiceAndroid : public sync_driver::SyncServiceObserver {
  public:
+
   ProfileSyncServiceAndroid(JNIEnv* env, jobject obj);
   ~ProfileSyncServiceAndroid() override;
 
@@ -45,7 +45,7 @@ class ProfileSyncServiceAndroid : public syncer::SyncServiceObserver {
   // Returns false if we didn't get a ProfileSyncService.
   bool Init();
 
-  // syncer::SyncServiceObserver:
+  // sync_driver::SyncServiceObserver:
   void OnStateChanged() override;
 
   // Pure ProfileSyncService calls.
@@ -205,11 +205,11 @@ class ProfileSyncServiceAndroid : public syncer::SyncServiceObserver {
   browser_sync::ProfileSyncService* sync_service_;
 
   // Prevents Sync from running until configuration is complete.
-  std::unique_ptr<syncer::SyncSetupInProgressHandle> sync_blocker_;
+  std::unique_ptr<sync_driver::SyncSetupInProgressHandle> sync_blocker_;
 
   // The class that handles getting, setting, and persisting sync
   // preferences.
-  std::unique_ptr<syncer::SyncPrefs> sync_prefs_;
+  std::unique_ptr<sync_driver::SyncPrefs> sync_prefs_;
 
   // Java-side ProfileSyncService object.
   JavaObjectWeakGlobalRef weak_java_profile_sync_service_;