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

components/sync/driver/generic_change_processor_factory.h

Index: components/sync/driver/generic_change_processor_factory.h
diff --git a/components/sync/driver/generic_change_processor_factory.h b/components/sync/driver/generic_change_processor_factory.h
index c071c5811703816a2eba573639f2a4ea8d107339..bc91e1be571aaa6ce3807e4dde0be30e12c06129 100644
--- a/components/sync/driver/generic_change_processor_factory.h
+++ b/components/sync/driver/generic_change_processor_factory.h
@@ -13,16 +13,13 @@
 #include "components/sync/base/model_type.h"
 
 namespace syncer {
-class AttachmentService;
-class SyncableService;
-class SyncMergeResult;
-struct UserShare;
-}
-
-namespace sync_driver {
 
+class AttachmentService;
 class GenericChangeProcessor;
 class SyncClient;
+class SyncMergeResult;
+class SyncableService;
+struct UserShare;
 
 // Because GenericChangeProcessors are created and used only from the model
 // thread, their lifetime is strictly shorter than other components like
@@ -38,17 +35,17 @@ class GenericChangeProcessorFactory {
   GenericChangeProcessorFactory();
   virtual ~GenericChangeProcessorFactory();
   virtual std::unique_ptr<GenericChangeProcessor> CreateGenericChangeProcessor(
-      syncer::ModelType type,
-      syncer::UserShare* user_share,
-      std::unique_ptr<syncer::DataTypeErrorHandler> error_handler,
-      const base::WeakPtr<syncer::SyncableService>& local_service,
-      const base::WeakPtr<syncer::SyncMergeResult>& merge_result,
+      ModelType type,
+      UserShare* user_share,
+      std::unique_ptr<DataTypeErrorHandler> error_handler,
+      const base::WeakPtr<SyncableService>& local_service,
+      const base::WeakPtr<SyncMergeResult>& merge_result,
       SyncClient* sync_client);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(GenericChangeProcessorFactory);
 };
 
-}  // namespace sync_driver
+}  // namespace syncer
 
 #endif  // COMPONENTS_SYNC_DRIVER_GENERIC_CHANGE_PROCESSOR_FACTORY_H_