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

components/sync/driver/directory_data_type_controller.h

Index: components/sync/driver/directory_data_type_controller.h
diff --git a/components/sync/driver/directory_data_type_controller.h b/components/sync/driver/directory_data_type_controller.h
index 1f0a8e88f2d091ea904f00b2ed6c17ea2b348a93..76fa60f244105328cffc940eee97f9904fe85135 100644
--- a/components/sync/driver/directory_data_type_controller.h
+++ b/components/sync/driver/directory_data_type_controller.h
@@ -11,8 +11,7 @@
 #include "components/sync/engine/model_safe_worker.h"
 #include "components/sync/syncable/directory.h"
 
-namespace syncer {
-
+namespace sync_driver {
 class ChangeProcessor;
 
 // Base class for Directory based Data type controllers.
@@ -46,19 +45,19 @@ class DirectoryDataTypeController : public DataTypeController {
   // Returns a ListValue representing all nodes for a specified type by querying
   // the directory.
   static std::unique_ptr<base::ListValue> GetAllNodesForTypeFromDirectory(
-      ModelType type,
-      syncable::Directory* directory);
+      syncer::ModelType type,
+      syncer::syncable::Directory* directory);
 
  protected:
   // |dump_stack| is called when an unrecoverable error occurs.
-  DirectoryDataTypeController(ModelType type,
+  DirectoryDataTypeController(syncer::ModelType type,
                               const base::Closure& dump_stack,
                               SyncClient* sync_client);
 
   // The model safe group of this data type.  This should reflect the
   // thread that should be used to modify the data type's native
   // model.
-  virtual ModelSafeGroup model_safe_group() const = 0;
+  virtual syncer::ModelSafeGroup model_safe_group() const = 0;
 
   // Access to the ChangeProcessor for the type being controlled by |this|.
   // Returns NULL if the ChangeProcessor isn't created or connected.
@@ -67,6 +66,6 @@ class DirectoryDataTypeController : public DataTypeController {
   SyncClient* const sync_client_;
 };
 
-}  // namespace syncer
+}  // namespace sync_driver
 
 #endif  // COMPONENTS_SYNC_DRIVER_DIRECTORY_DATA_TYPE_CONTROLLER_H__