Reland r105404 with compile warning fixed.

chrome/browser/sync/glue/app_data_type_controller.cc

Index: chrome/browser/sync/glue/app_data_type_controller.cc
diff --git a/chrome/browser/sync/glue/app_data_type_controller.cc b/chrome/browser/sync/glue/app_data_type_controller.cc
index 5be7863261204f406b06bfa3c4fcd13a859a39af..94062462e1015a24988e922e372ed1fd51e85f04 100644
--- a/chrome/browser/sync/glue/app_data_type_controller.cc
+++ b/chrome/browser/sync/glue/app_data_type_controller.cc
@@ -36,7 +36,13 @@ void AppDataTypeController::CreateSyncComponents() {
       profile_sync_factory_->CreateAppSyncComponents(sync_service_,
                                                      this);
   set_model_associator(sync_components.model_associator);
-  set_change_processor(sync_components.change_processor);}
+  generic_change_processor_.reset(static_cast<GenericChangeProcessor*>(
+      sync_components.change_processor));
+}
+
+GenericChangeProcessor* AppDataTypeController::change_processor() const {
+  return generic_change_processor_.get();
+}
 
 void AppDataTypeController::RecordUnrecoverableError(
     const tracked_objects::Location& from_here,