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

chrome/browser/sync/glue/non_frontend_data_type_controller_mock.h

Index: chrome/browser/sync/glue/non_frontend_data_type_controller_mock.h
diff --git a/chrome/browser/sync/glue/frontend_data_type_controller_mock.h b/chrome/browser/sync/glue/non_frontend_data_type_controller_mock.h
similarity index 50%
copy from chrome/browser/sync/glue/frontend_data_type_controller_mock.h
copy to chrome/browser/sync/glue/non_frontend_data_type_controller_mock.h
index 0485b1f68fb42c9d28647692b4fce99842fea41c..400c7341b4f9c69bac6a04c13eb62b4e4e00e1c8 100644
--- a/chrome/browser/sync/glue/frontend_data_type_controller_mock.h
+++ b/chrome/browser/sync/glue/non_frontend_data_type_controller_mock.h
@@ -2,19 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SYNC_GLUE_FRONTEND_DATA_TYPE_CONTROLLER_MOCK_H__
-#define CHROME_BROWSER_SYNC_GLUE_FRONTEND_DATA_TYPE_CONTROLLER_MOCK_H__
+#ifndef CHROME_BROWSER_SYNC_GLUE_NON_FRONTEND_DATA_TYPE_CONTROLLER_MOCK_H__
+#define CHROME_BROWSER_SYNC_GLUE_NON_FRONTEND_DATA_TYPE_CONTROLLER_MOCK_H__
 #pragma once
 
-#include "chrome/browser/sync/glue/frontend_data_type_controller.h"
+#include "chrome/browser/sync/glue/non_frontend_data_type_controller.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace browser_sync {
 
-class FrontendDataTypeControllerMock : public FrontendDataTypeController {
+class NonFrontendDataTypeControllerMock : public NonFrontendDataTypeController {
  public:
-  FrontendDataTypeControllerMock();
-  virtual ~FrontendDataTypeControllerMock();
+  NonFrontendDataTypeControllerMock();
+  virtual ~NonFrontendDataTypeControllerMock();
 
   // DataTypeController mocks.
   MOCK_METHOD1(Start, void(StartCallback* start_callback));
@@ -27,15 +27,24 @@ class FrontendDataTypeControllerMock : public FrontendDataTypeController {
   MOCK_METHOD2(OnUnrecoverableError, void(const tracked_objects::Location&,
                                           const std::string&));
 
-  // FrontendDataTypeController mocks.
+  // NonFrontendDataTypeController mocks.
   MOCK_METHOD0(StartModels, bool());
-  MOCK_METHOD0(Associate, bool());
-  MOCK_METHOD0(CleanupState, void());
-  MOCK_METHOD2(FinishStart, void(StartResult result,
-                                 const tracked_objects::Location& from_here));
+  MOCK_METHOD0(KickOffAssociation, bool());
+  MOCK_METHOD0(Associate, void());
+  MOCK_METHOD0(CreateSyncComponents, void());
   MOCK_METHOD2(StartFailed, void(StartResult result,
                                  const tracked_objects::Location& from_here));
-  MOCK_METHOD0(CreateSyncComponents, void());
+  MOCK_METHOD3(StartDone, void(DataTypeController::StartResult result,
+                               DataTypeController::State new_state,
+                               const tracked_objects::Location& location));
+  MOCK_METHOD3(StartDoneImpl, void(DataTypeController::StartResult result,
+                                   DataTypeController::State new_state,
+                                   const tracked_objects::Location& location));
+  MOCK_METHOD0(CleanUpState, void());
+  MOCK_METHOD0(KickOffDestroy, bool());
+  MOCK_METHOD0(Destroy, void());
+  MOCK_METHOD2(OnUnrecoverableErrorImpl, void(const tracked_objects::Location&,
+                                              const std::string&));
   MOCK_METHOD2(RecordUnrecoverableError, void(const tracked_objects::Location&,
                                               const std::string&));
   MOCK_METHOD1(RecordAssociationTime, void(base::TimeDelta time));
@@ -44,4 +53,4 @@ class FrontendDataTypeControllerMock : public FrontendDataTypeController {
 
 }  // namespace browser_sync
 
-#endif  // CHROME_BROWSER_SYNC_GLUE_FRONTEND_DATA_TYPE_CONTROLLER_MOCK_H__
+#endif  // CHROME_BROWSER_SYNC_GLUE_NON_FRONTEND_DATA_TYPE_CONTROLLER_MOCK_H__