Reland r105404 with compile warning fixed.

chrome/browser/sync/glue/search_engine_data_type_controller.cc

Index: chrome/browser/sync/glue/search_engine_data_type_controller.cc
diff --git a/chrome/browser/sync/glue/search_engine_data_type_controller.cc b/chrome/browser/sync/glue/search_engine_data_type_controller.cc
index 7e434c9e87a0913c20b802787ac49f2aa3ceaece..9f90cd54e5281ce7f868e81607a16a7cfdabaa71 100644
--- a/chrome/browser/sync/glue/search_engine_data_type_controller.cc
+++ b/chrome/browser/sync/glue/search_engine_data_type_controller.cc
@@ -9,7 +9,6 @@
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/sync/api/syncable_service.h"
-#include "chrome/browser/sync/glue/generic_change_processor.h"
 #include "chrome/browser/sync/profile_sync_factory.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/common/chrome_notification_types.h"
@@ -70,7 +69,13 @@ void SearchEngineDataTypeController::CreateSyncComponents() {
       profile_sync_factory_->CreateSearchEngineSyncComponents(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* SearchEngineDataTypeController::change_processor()
+    const {
+  return generic_change_processor_.get();
 }
 
 void SearchEngineDataTypeController::RecordUnrecoverableError(