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

chrome/browser/sync/glue/frontend_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/frontend_data_type_controller.h"
 
 #include "base/logging.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/api/sync_error.h"
 #include "chrome/browser/sync/glue/change_processor.h"
@@ skipping 84 matching lines @@
   base::TimeTicks start_time = base::TimeTicks::Now();
   SyncError error;
   bool merge_success = model_associator()->AssociateModels(&error);
   RecordAssociationTime(base::TimeTicks::Now() - start_time);
   if (!merge_success) {
     StartFailed(ASSOCIATION_FAILED, error);
     return false;
   }
 
   sync_service_->ActivateDataType(type(), model_safe_group(),
-                                  change_processor());
+                                  change_processor_.get());
   state_ = RUNNING;
   // FinishStart() invokes the DataTypeManager callback, which can lead to a
   // call to Stop() if one of the other data types being started generates an
   // error.
   FinishStart(!sync_has_nodes ? OK_FIRST_RUN : OK);
   // Return false if we're not in the RUNNING state (due to Stop() being called
   // from FinishStart()).
   // TODO(zea/atwilson): Should we maybe move the call to FinishStart() out of
   // Associate() and into Start(), so we don't need this logic here? It seems
   // cleaner to call FinishStart() from Start().
@@ skipping 94 matching lines @@
 ChangeProcessor* FrontendDataTypeController::change_processor() const {
   return change_processor_.get();
 }
 
 void FrontendDataTypeController::set_change_processor(
     ChangeProcessor* change_processor) {
   change_processor_.reset(change_processor);
 }
 
 }  // namespace browser_sync