[Sync] Fix namespace for sync_driver component

chrome/browser/sync/glue/non_frontend_data_type_controller.h

Index: chrome/browser/sync/glue/non_frontend_data_type_controller.h
diff --git a/chrome/browser/sync/glue/non_frontend_data_type_controller.h b/chrome/browser/sync/glue/non_frontend_data_type_controller.h
index 335310a2038bfccc642ada0fe69836585106d8b1..fac5890736fc14b358bcd6b0ca1ae2ee801e7d50 100644
--- a/chrome/browser/sync/glue/non_frontend_data_type_controller.h
+++ b/chrome/browser/sync/glue/non_frontend_data_type_controller.h
@@ -29,10 +29,12 @@ namespace syncer {
 class SyncError;
 }
 
-namespace browser_sync {
-
+namespace sync_driver {
 class AssociatorInterface;
 class ChangeProcessor;
+}
+
+namespace browser_sync {
 
 // Implementation for datatypes that do not reside on the frontend thread
 // (UI thread). This is the same thread we perform initialization
@@ -42,7 +44,7 @@ class ChangeProcessor;
 //    model_safe_group()
 //    PostTaskOnBackendThread()
 //    CreateSyncComponents()
-class NonFrontendDataTypeController : public DataTypeController {
+class NonFrontendDataTypeController : public sync_driver::DataTypeController {
  public:
   // For creating non-frontend processor/associator and associating on backend.
   class BackendComponentsContainer;
@@ -81,8 +83,8 @@ class NonFrontendDataTypeController : public DataTypeController {
     syncer::SyncMergeResult local_merge_result;
     syncer::SyncMergeResult syncer_merge_result;
     base::TimeDelta association_time;
-    ChangeProcessor* change_processor;
-    AssociatorInterface* model_associator;
+    sync_driver::ChangeProcessor* change_processor;
+    sync_driver::AssociatorInterface* model_associator;
   };
   void AssociationCallback(AssociationResult result);
 
@@ -127,7 +129,7 @@ class NonFrontendDataTypeController : public DataTypeController {
 
   // Called on UI thread during shutdown to effectively disable processing
   // any changes.
-  virtual void DisconnectProcessor(ChangeProcessor* processor) = 0;
+  virtual void DisconnectProcessor(sync_driver::ChangeProcessor* processor) = 0;
 
   // Start up complete, update the state and invoke the callback.
   // Note: this is performed on the datatype's thread.
@@ -167,8 +169,8 @@ class NonFrontendDataTypeController : public DataTypeController {
   void set_start_callback(const StartCallback& callback);
   void set_state(State state);
 
-  virtual AssociatorInterface* associator() const;
-  virtual ChangeProcessor* GetChangeProcessor() const OVERRIDE;
+  virtual sync_driver::AssociatorInterface* associator() const;
+  virtual sync_driver::ChangeProcessor* GetChangeProcessor() const OVERRIDE;
 
   State state_;
   StartCallback start_callback_;
@@ -184,8 +186,8 @@ class NonFrontendDataTypeController : public DataTypeController {
   // and associate model. Released on backend.
   scoped_ptr<BackendComponentsContainer> components_container_;
 
-  AssociatorInterface* model_associator_;
-  ChangeProcessor* change_processor_;
+  sync_driver::AssociatorInterface* model_associator_;
+  sync_driver::ChangeProcessor* change_processor_;
 
   base::WeakPtrFactory<NonFrontendDataTypeController> weak_ptr_factory_;