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

components/sync/driver/non_ui_data_type_controller.h

Index: components/sync/driver/non_ui_data_type_controller.h
diff --git a/components/sync/driver/non_ui_data_type_controller.h b/components/sync/driver/non_ui_data_type_controller.h
index 79947d40f5cac39a0554accddea7a2783bf1ccf5..80d859ca45bb1a34eba9bad410809433384ec480 100644
--- a/components/sync/driver/non_ui_data_type_controller.h
+++ b/components/sync/driver/non_ui_data_type_controller.h
@@ -15,15 +15,18 @@
 #include "components/sync/driver/shared_change_processor.h"
 
 namespace syncer {
-
-class SyncClient;
 class SyncableService;
 struct UserShare;
+}
+
+namespace sync_driver {
+
+class SyncClient;
 
 class NonUIDataTypeController : public DirectoryDataTypeController {
  public:
   // |dump_stack| is called when an unrecoverable error occurs.
-  NonUIDataTypeController(ModelType type,
+  NonUIDataTypeController(syncer::ModelType type,
                           const base::Closure& dump_stack,
                           SyncClient* sync_client);
   ~NonUIDataTypeController() override;
@@ -32,7 +35,7 @@ class NonUIDataTypeController : public DirectoryDataTypeController {
   void LoadModels(const ModelLoadCallback& model_load_callback) override;
   void StartAssociating(const StartCallback& start_callback) override;
   void Stop() override;
-  ModelSafeGroup model_safe_group() const override = 0;
+  syncer::ModelSafeGroup model_safe_group() const override = 0;
   ChangeProcessor* GetChangeProcessor() const override;
   std::string name() const override;
   State state() const override;
@@ -64,8 +67,8 @@ class NonUIDataTypeController : public DirectoryDataTypeController {
 
   // Start up complete, update the state and invoke the callback.
   virtual void StartDone(DataTypeController::ConfigureResult start_result,
-                         const SyncMergeResult& local_merge_result,
-                         const SyncMergeResult& syncer_merge_result);
+                         const syncer::SyncMergeResult& local_merge_result,
+                         const syncer::SyncMergeResult& syncer_merge_result);
 
   // Kick off the association process.
   virtual bool StartAssociationAsync();
@@ -82,7 +85,7 @@ class NonUIDataTypeController : public DirectoryDataTypeController {
   // us know that it is safe to start associating.
   void OnModelLoaded();
 
-  std::unique_ptr<DataTypeErrorHandler> CreateErrorHandler() override;
+  std::unique_ptr<syncer::DataTypeErrorHandler> CreateErrorHandler() override;
 
  private:
   // Posted on the backend thread by StartAssociationAsync().
@@ -101,11 +104,11 @@ class NonUIDataTypeController : public DirectoryDataTypeController {
   // Disable this type with the sync service. Should only be invoked in case of
   // an unrecoverable error.
   // Note: this is performed on the UI thread.
-  void DisableImpl(const SyncError& error);
+  void DisableImpl(const syncer::SyncError& error);
 
   // UserShare is stored in StartAssociating while on UI thread and
   // passed to SharedChangeProcessor::Connect on the model thread.
-  UserShare* user_share_;
+  syncer::UserShare* user_share_;
 
   // State of this datatype controller.
   State state_;
@@ -130,6 +133,6 @@ class NonUIDataTypeController : public DirectoryDataTypeController {
   scoped_refptr<SharedChangeProcessor> shared_change_processor_;
 };
 
-}  // namespace syncer
+}  // namespace sync_driver
 
 #endif  // COMPONENTS_SYNC_DRIVER_NON_UI_DATA_TYPE_CONTROLLER_H_