Revert 56423 - Added classes to enable session sync functionality....

chrome/browser/sync/glue/session_data_type_controller.cc

Index: chrome/browser/sync/glue/session_data_type_controller.cc
===================================================================
--- chrome/browser/sync/glue/session_data_type_controller.cc	(revision 56425)
+++ chrome/browser/sync/glue/session_data_type_controller.cc	(working copy)
@@ -1,113 +0,0 @@
-// Copyright (c) 2010 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 "base/histogram.h"
-#include "base/logging.h"
-#include "base/time.h"
-#include "chrome/browser/chrome_thread.h"
-#include "chrome/browser/sync/glue/session_change_processor.h"
-#include "chrome/browser/sync/glue/session_data_type_controller.h"
-#include "chrome/browser/sync/glue/session_model_associator.h"
-#include "chrome/browser/sync/profile_sync_service.h"
-#include "chrome/browser/sync/profile_sync_factory.h"
-#include "chrome/browser/sync/unrecoverable_error_handler.h"
-
-namespace browser_sync {
-
-SessionDataTypeController::SessionDataTypeController(
-    ProfileSyncFactory* profile_sync_factory,
-    ProfileSyncService* sync_service)
-    : profile_sync_factory_(profile_sync_factory),
-      sync_service_(sync_service),
-      state_(NOT_RUNNING) {
-  DCHECK(profile_sync_factory);
-  DCHECK(sync_service);
-}
-
-SessionDataTypeController::~SessionDataTypeController() {
-}
-
-void SessionDataTypeController::Start(StartCallback* start_callback) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
-  DCHECK(start_callback);
-  if (state_ != NOT_RUNNING) {
-    start_callback->Run(BUSY);
-    delete start_callback;
-    return;
-  }
-
-  start_callback_.reset(start_callback);
-
-  ProfileSyncFactory::SyncComponents sync_components =
-      profile_sync_factory_->CreateSessionSyncComponents(sync_service_,
-                                                           this);
-  model_associator_.reset(sync_components.model_associator);
-  change_processor_.reset(sync_components.change_processor);
-
-  bool sync_has_nodes = false;
-  if (!model_associator_->SyncModelHasUserCreatedNodes(&sync_has_nodes)) {
-    StartFailed(UNRECOVERABLE_ERROR);
-    return;
-  }
-
-  base::TimeTicks start_time = base::TimeTicks::Now();
-  bool success = model_associator_->AssociateModels();
-  UMA_HISTOGRAM_TIMES("Sync.SessionAssociationTime",
-                      base::TimeTicks::Now() - start_time);
-  if (!success) {
-    StartFailed(ASSOCIATION_FAILED);
-    return;
-  }
-
-  sync_service_->ActivateDataType(this, change_processor_.get());
-  state_ = RUNNING;
-  FinishStart(!sync_has_nodes ? OK_FIRST_RUN : OK);
-}
-
-void SessionDataTypeController::Stop() {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
-
-  if (change_processor_ != NULL)
-    sync_service_->DeactivateDataType(this, change_processor_.get());
-
-  if (model_associator_ != NULL)
-    model_associator_->DisassociateModels();
-
-  change_processor_.reset();
-  model_associator_.reset();
-  start_callback_.reset();
-
-  state_ = NOT_RUNNING;
-}
-
-void SessionDataTypeController::OnUnrecoverableError(
-    const tracked_objects::Location& from_here,
-    const std::string& message) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
-  UMA_HISTOGRAM_COUNTS("Sync.SessionRunFailures", 1);
-  sync_service_->OnUnrecoverableError(from_here, message);
-}
-
-browser_sync::SessionModelAssociator*
-    SessionDataTypeController::GetModelAssociator() {
-  return static_cast<SessionModelAssociator*>(model_associator_.get());
-}
-
-void SessionDataTypeController::FinishStart(StartResult result) {
-  start_callback_->Run(result);
-  start_callback_.reset();
-}
-
-void SessionDataTypeController::StartFailed(StartResult result) {
-  model_associator_.reset();
-  change_processor_.reset();
-  start_callback_->Run(result);
-  start_callback_.reset();
-  UMA_HISTOGRAM_ENUMERATION("Sync.SessionStartFailures",
-                            result,
-                            MAX_START_RESULT);
-}
-
-}  // namespace browser_sync
-