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

chrome/browser/sync/glue/new_non_frontend_data_type_controller.cc

Index: chrome/browser/sync/glue/new_non_frontend_data_type_controller.cc
===================================================================
--- chrome/browser/sync/glue/new_non_frontend_data_type_controller.cc	(revision 105407)
+++ chrome/browser/sync/glue/new_non_frontend_data_type_controller.cc	(working copy)
@@ -1,220 +0,0 @@
-// 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/new_non_frontend_data_type_controller.h"
-
-#include "base/logging.h"
-#include "chrome/browser/sync/profile_sync_factory.h"
-#include "chrome/browser/sync/profile_sync_service.h"
-#include "chrome/browser/sync/api/sync_error.h"
-#include "chrome/browser/sync/api/syncable_service.h"
-#include "chrome/browser/sync/glue/shared_change_processor_ref.h"
-#include "chrome/browser/sync/syncable/model_type.h"
-#include "content/browser/browser_thread.h"
-
-namespace browser_sync {
-
-NewNonFrontendDataTypeController::NewNonFrontendDataTypeController()
-    : shared_change_processor_(NULL) {}
-
-NewNonFrontendDataTypeController::NewNonFrontendDataTypeController(
-    ProfileSyncFactory* profile_sync_factory,
-    Profile* profile)
-    : NonFrontendDataTypeController(profile_sync_factory, profile),
-      shared_change_processor_(NULL) {
-}
-
-NewNonFrontendDataTypeController::~NewNonFrontendDataTypeController() {}
-
-void NewNonFrontendDataTypeController::Start(StartCallback* start_callback) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  DCHECK(start_callback);
-  if (state() != NOT_RUNNING) {
-    start_callback->Run(BUSY, SyncError());
-    delete start_callback;
-    return;
-  }
-
-  set_start_callback(start_callback);
-
-  set_state(MODEL_STARTING);
-  if (!StartModels()) {
-    // If we are waiting for some external service to load before associating
-    // or we failed to start the models, we exit early.
-    DCHECK(state() == MODEL_STARTING || state() == NOT_RUNNING);
-    return;
-  }
-
-  shared_change_processor_ =
-      profile_sync_factory()->CreateSharedChangeProcessor();
-
-  // Kick off association on the thread the datatype resides on.
-  set_state(ASSOCIATING);
-  if (!StartAssociationAsync()) {
-    // Releasing the shared_change_processor_ here is safe since it was never
-    // connected.
-    shared_change_processor_ = NULL;
-    SyncError error(FROM_HERE, "Failed to post StartAssociation", type());
-    StartDoneImpl(ASSOCIATION_FAILED, NOT_RUNNING, error);
-  }
-}
-
-// This method can execute after we've already stopped (and possibly even
-// destroyed) both the Syncer and the SyncableService. As a result, all actions
-// must either have no side effects outside of the DTC or must be protected
-// by |shared_change_processor_|, which is guaranteed to have been Disconnected
-// if the syncer shut down.
-void NewNonFrontendDataTypeController::StartAssociation() {
-  DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::UI));
-  DCHECK_EQ(state(), ASSOCIATING);
-
-  // We're dependent on the SyncableService being destroyed on the same thread
-  // we access it. Therefore, as long as GetWeakPtrToSyncableService returns
-  // a valid WeakPtr, we can rely on it remaining initialized for the
-  // life of this method.
-  local_service_ = GetWeakPtrToSyncableService();
-  if (!local_service_.get()) {
-    // The SyncableService was destroyed before this task had a chance to
-    // execute.
-    SyncError error(FROM_HERE, "Local service destroyed before association.",
-                    type());
-    StartFailed(UNRECOVERABLE_ERROR, error);
-    return;
-  }
-
-  // Connect |shared_change_processor_| to the syncer and |local_service_|.
-  // Note that it's possible the shared_change_processor_ has already been
-  // disconnected at this point, so all our accesses to the syncer from this
-  // point on are through it.
-  if (!shared_change_processor_->Connect(profile_sync_factory(),
-                                         profile_sync_service(),
-                                         this,
-                                         local_service_)) {
-    SyncError error(FROM_HERE, "Failed to connect to syncer.", type());
-    StartFailed(UNRECOVERABLE_ERROR, error);
-  }
-
-  if (!shared_change_processor_->CryptoReadyIfNecessary(type())) {
-    StartFailed(NEEDS_CRYPTO, SyncError());
-    return;
-  }
-
-  bool sync_has_nodes = false;
-  if (!shared_change_processor_->SyncModelHasUserCreatedNodes(
-          type(), &sync_has_nodes)) {
-    SyncError error(FROM_HERE, "Failed to load sync nodes", type());
-    StartFailed(UNRECOVERABLE_ERROR, error);
-    return;
-  }
-
-  base::TimeTicks start_time = base::TimeTicks::Now();
-  SyncError error;
-  SyncDataList initial_sync_data;
-  error = shared_change_processor_->GetSyncDataForType(type(),
-                                                       &initial_sync_data);
-  if (error.IsSet()) {
-    StartFailed(ASSOCIATION_FAILED, error);
-    return;
-  }
-  // Passes a reference to the shared_change_processor_;
-  error = local_service_->MergeDataAndStartSyncing(
-      type(),
-      initial_sync_data,
-      new SharedChangeProcessorRef(shared_change_processor_));
-  RecordAssociationTime(base::TimeTicks::Now() - start_time);
-  if (error.IsSet()) {
-    local_service_->StopSyncing(type());
-    StartFailed(ASSOCIATION_FAILED, error);
-    return;
-  }
-
-  // If we've been disconnected, profile_sync_service() may return an invalid
-  // pointer, but the shared_change_processor_ protects us from attempting to
-  // access it.
-  // Note: This must be done on the datatype's thread to ensure local_service_
-  // doesn't start trying to push changes from it's thread before we activate
-  // the datatype.
-  shared_change_processor_->ActivateDataType(profile_sync_service(),
-                                             type(), model_safe_group());
-  StartDone(!sync_has_nodes ? OK_FIRST_RUN : OK, RUNNING, SyncError());
-}
-
-void NewNonFrontendDataTypeController::StartDone(
-    DataTypeController::StartResult result,
-    DataTypeController::State new_state,
-    const SyncError& error) {
-  DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::UI));
-  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
-      base::Bind(
-          &NewNonFrontendDataTypeController::StartDoneImpl,
-          this,
-          result,
-          new_state,
-          error));
-}
-
-void NewNonFrontendDataTypeController::Stop() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
-  // Disconnect the change processor. At this point, the SyncableService
-  // can no longer interact with the Syncer, even if it hasn't finished
-  // MergeDataAndStartSyncing. It may still have ownership of the shared
-  // change processor though.
-  if (shared_change_processor_.get())
-    shared_change_processor_->Disconnect();
-
-  // If we haven't finished starting, we need to abort the start.
-  switch (state()) {
-    case MODEL_STARTING:
-      set_state(STOPPING);
-      StartDoneImpl(ABORTED, NOT_RUNNING, SyncError());
-      return;  // The datatype was never activated, we're done.
-    case ASSOCIATING:
-      set_state(STOPPING);
-      StartDoneImpl(ABORTED, NOT_RUNNING, SyncError());
-      // We continue on to deactivate the datatype.
-      break;
-    case DISABLED:
-      // If we're disabled we never succeded assocaiting and never activated the
-      // datatype.
-      set_state(NOT_RUNNING);
-      StopModels();
-      return;
-    default:
-      // Datatype was fully started.
-      DCHECK_EQ(state(), RUNNING);
-      set_state(STOPPING);
-      StopModels();
-      break;
-  }
-
-  // Deactivate the DataType on the UI thread. We dont want to listen
-  // for any more changes or process them from the server.
-  profile_sync_service()->DeactivateDataType(type());
-
-  // Stop the local service and release our references to it and the
-  // shared change processor (posts a task to the datatype's thread).
-  StopLocalServiceAsync();
-
-  set_state(NOT_RUNNING);
-}
-
-void NewNonFrontendDataTypeController::StopLocalService() {
-  DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::UI));
-  if (local_service_.get())
-    local_service_->StopSyncing(type());
-  local_service_.reset();
-  shared_change_processor_ = NULL;
-}
-
-bool NewNonFrontendDataTypeController::StopAssociationAsync() {
-  NOTIMPLEMENTED();
-  return false;
-}
-
-void NewNonFrontendDataTypeController::CreateSyncComponents() {
-  NOTIMPLEMENTED();
-}
-
-}  // namepsace browser_sync