Revert 105404 - [Sync] Refactor non-frontend DTC to handle new API properly.

chrome/browser/sync/glue/search_engine_data_type_controller.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/browser/sync/glue/search_engine_data_type_controller.h"
 
 #include "base/metrics/histogram.h"
 #include "chrome/browser/profiles/profile.h"
 #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"
 #include "content/common/notification_source.h"
 
 namespace browser_sync {
 
 SearchEngineDataTypeController::SearchEngineDataTypeController(
     ProfileSyncFactory* profile_sync_factory,
     Profile* profile,
@@ skipping 40 matching lines @@
 // Cleanup for our extra registrar usage.
 void SearchEngineDataTypeController::CleanUpState() {
   registrar_.RemoveAll();
 }
 
 void SearchEngineDataTypeController::CreateSyncComponents() {
   ProfileSyncFactory::SyncComponents sync_components =
       profile_sync_factory_->CreateSearchEngineSyncComponents(sync_service_,
                                                               this);
   set_model_associator(sync_components.model_associator);
-  generic_change_processor_.reset(static_cast<GenericChangeProcessor*>(
-      sync_components.change_processor));
-}
-
-GenericChangeProcessor* SearchEngineDataTypeController::change_processor()
-    const {
-  return generic_change_processor_.get();
+  set_change_processor(sync_components.change_processor);
 }
 
 void SearchEngineDataTypeController::RecordUnrecoverableError(
     const tracked_objects::Location& from_here,
     const std::string& message) {
   UMA_HISTOGRAM_COUNTS("Sync.SearchEngineRunFailures", 1);
 }
 
 void SearchEngineDataTypeController::RecordAssociationTime(
     base::TimeDelta time) {
   UMA_HISTOGRAM_TIMES("Sync.SearchEngineAssociationTime", time);
 }
 
 void SearchEngineDataTypeController::RecordStartFailure(StartResult result) {
   UMA_HISTOGRAM_ENUMERATION("Sync.SearchEngineStartFailures",
                             result,
                             MAX_START_RESULT);
 }
 
 }  // namespace browser_sync