[Sync] Make generic non-frontend thread datatype controller.

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/glue/change_processor.h"
 #include "chrome/browser/sync/glue/model_associator.h"
@@ skipping 85 matching lines @@
     StartFailed(ASSOCIATION_FAILED, FROM_HERE);
     return false;
   }
 
   sync_service_->ActivateDataType(this, change_processor_.get());
   state_ = RUNNING;
   FinishStart(!sync_has_nodes ? OK_FIRST_RUN : OK, FROM_HERE);
   return true;
 }
 
+void FrontendDataTypeController::StartFailed(StartResult result,
+    const tracked_objects::Location& location) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  CleanUpState();
+  model_associator_.reset();
+  change_processor_.reset();
+  state_ = NOT_RUNNING;
+  RecordStartFailure(result);
+
+  // We have to release the callback before we call it, since it's possible
+  // invoking the callback will trigger a call to STOP(), which will get
+  // confused by the non-NULL start_callback_.
+  scoped_ptr<StartCallback> callback(start_callback_.release());
+  callback->Run(result, location);
+}
+
+void FrontendDataTypeController::FinishStart(StartResult result,
+    const tracked_objects::Location& location) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+
+  // We have to release the callback before we call it, since it's possible
+  // invoking the callback will trigger a call to STOP(), which will get
+  // confused by the non-NULL start_callback_.
+  scoped_ptr<StartCallback> callback(start_callback_.release());
+  callback->Run(result, location);
+}
+
 void FrontendDataTypeController::Stop() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   // If Stop() is called while Start() is waiting for the datatype model to
   // load, abort the start.
-  if (state_ == MODEL_STARTING)
-    FinishStart(ABORTED, FROM_HERE);
+  if (state_ == MODEL_STARTING) {
+    StartFailed(ABORTED, FROM_HERE);
+    // We can just return here since we haven't performed association if we're
+    // still in MODEL_STARTING.
+    return;
+  }
   DCHECK(!start_callback_.get());
 
-  CleanupState();
+  CleanUpState();
 
   if (change_processor_ != NULL)
     sync_service_->DeactivateDataType(this, change_processor_.get());
 
   if (model_associator_ != NULL)
     model_associator_->DisassociateModels();
 
   change_processor_.reset();
   model_associator_.reset();
 
   state_ = NOT_RUNNING;
 }
 
-void FrontendDataTypeController::CleanupState() {
+void FrontendDataTypeController::CleanUpState() {
   // Do nothing by default.
 }
 
 browser_sync::ModelSafeGroup FrontendDataTypeController::model_safe_group()
     const {
   return browser_sync::GROUP_UI;
 }
 
 std::string FrontendDataTypeController::name() const {
   // For logging only.
   return syncable::ModelTypeToString(type());
 }
 
 DataTypeController::State FrontendDataTypeController::state() const {
   return state_;
 }
 
 void FrontendDataTypeController::OnUnrecoverableError(
     const tracked_objects::Location& from_here, const std::string& message) {
   // The ProfileSyncService will invoke our Stop() method in response to this.
   RecordUnrecoverableError(from_here, message);
   sync_service_->OnUnrecoverableError(from_here, message);
 }
 
-void FrontendDataTypeController::FinishStart(StartResult result,
-    const tracked_objects::Location& location) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  start_callback_->Run(result, location);
-  start_callback_.reset();
-}
-
-void FrontendDataTypeController::StartFailed(StartResult result,
-    const tracked_objects::Location& location) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  CleanupState();
-  model_associator_.reset();
-  change_processor_.reset();
-  state_ = NOT_RUNNING;
-  start_callback_->Run(result, location);
-  start_callback_.reset();
-  RecordStartFailure(result);
-}
-
 }  // namespace browser_sync