Refactor preference syncing.

chrome/browser/sync/glue/non_frontend_data_type_controller.cc

Index: chrome/browser/sync/glue/non_frontend_data_type_controller.cc
diff --git a/chrome/browser/sync/glue/non_frontend_data_type_controller.cc b/chrome/browser/sync/glue/non_frontend_data_type_controller.cc
index d26baef48d17666eff2cd882bbc5d1010c6b9560..661583b43acc20fb6a65954fcaeb5b2d77eab8df 100644
--- a/chrome/browser/sync/glue/non_frontend_data_type_controller.cc
+++ b/chrome/browser/sync/glue/non_frontend_data_type_controller.cc
@@ -194,7 +194,7 @@ void NonFrontendDataTypeController::Stop() {
 
   // Deactivate the change processor on the UI thread. We dont want to listen
   // for any more changes or process them from server.
-  if (change_processor_ != NULL)
+  if (change_processor_.get())
     profile_sync_service_->DeactivateDataType(this, change_processor_.get());
 
   if (StopAssociationAsync()) {
@@ -215,10 +215,10 @@ void NonFrontendDataTypeController::StopModels() {
 
 void NonFrontendDataTypeController::StopAssociation() {
   DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::UI));
-  if (model_associator_ != NULL)
+  if (model_associator_.get())
     model_associator_->DisassociateModels();
-  change_processor_.reset();
   model_associator_.reset();
+  change_processor_.reset();
   datatype_stopped_.Signal();
 }