[Sync] Move //components/sync to the syncer namespace, take 2.

components/sync/driver/non_ui_model_type_controller.h

 // Copyright 2016 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 COMPONENTS_SYNC_DRIVER_NON_UI_MODEL_TYPE_CONTROLLER_H_
 #define COMPONENTS_SYNC_DRIVER_NON_UI_MODEL_TYPE_CONTROLLER_H_
 
 #include "components/sync/driver/non_blocking_data_type_controller.h"
 
-namespace sync_driver {
+namespace syncer {
+
 class SyncClient;
-}
-
-namespace sync_driver_v2 {
 
 // Implementation for Unified Sync and Storage datatypes whose model thread is
 // not the UI thread.
 // Derived types must implement the following methods:
 // - RunOnModelThread
 class NonUIModelTypeController : public NonBlockingDataTypeController {
  public:
   // |dump_stack| is called when an unrecoverable error occurs.
-  NonUIModelTypeController(syncer::ModelType type,
+  NonUIModelTypeController(ModelType type,
                            const base::Closure& dump_stack,
-                           sync_driver::SyncClient* sync_client);
+                           SyncClient* sync_client);
   ~NonUIModelTypeController() override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NonUIModelTypeController);
 };
 
-}  // namespace sync_driver_v2
+}  // namespace syncer
 
 #endif  // COMPONENTS_SYNC_DRIVER_NON_UI_MODEL_TYPE_CONTROLLER_H_