Move DataTypeManager into sync_driver component

components/sync_driver/data_type_manager_impl.h

Index: components/sync_driver/data_type_manager_impl.h
diff --git a/chrome/browser/sync/glue/data_type_manager_impl.h b/components/sync_driver/data_type_manager_impl.h
similarity index 95%
rename from chrome/browser/sync/glue/data_type_manager_impl.h
rename to components/sync_driver/data_type_manager_impl.h
index 9a3e9597108c8952654dab313d7fcde0e11d5f7a..93b04230fc9a0f0077c6f692c0a85dba20939a48 100644
--- a/chrome/browser/sync/glue/data_type_manager_impl.h
+++ b/components/sync_driver/data_type_manager_impl.h
@@ -2,8 +2,8 @@
 // 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_DATA_TYPE_MANAGER_IMPL_H__
-#define CHROME_BROWSER_SYNC_GLUE_DATA_TYPE_MANAGER_IMPL_H__
+#ifndef COMPONENTS_SYNC_DRIVER_DATA_TYPE_MANAGER_IMPL_H__
+#define COMPONENTS_SYNC_DRIVER_DATA_TYPE_MANAGER_IMPL_H__
 
 #include "components/sync_driver/data_type_manager.h"
 
@@ -12,6 +12,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/callback_forward.h"
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
@@ -39,6 +40,7 @@ class DataTypeManagerImpl : public DataTypeManager,
                             public ModelAssociationResultProcessor {
  public:
   DataTypeManagerImpl(
+      const base::Closure& unrecoverable_error_method,
       const syncer::WeakHandle<syncer::DataTypeDebugInfoListener>&
           debug_info_listener,
       const DataTypeController::TypeMap* controllers,
@@ -184,6 +186,8 @@ class DataTypeManagerImpl : public DataTypeManager,
   // Association and time stats of data type configuration.
   std::vector<syncer::DataTypeConfigurationStats> configuration_stats_;
 
+  base::Closure unrecoverable_error_method_;
+
   base::WeakPtrFactory<DataTypeManagerImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DataTypeManagerImpl);
@@ -191,4 +195,4 @@ class DataTypeManagerImpl : public DataTypeManager,
 
 }  // namespace browser_sync
 
-#endif  // CHROME_BROWSER_SYNC_GLUE_DATA_TYPE_MANAGER_IMPL_H__
+#endif  // COMPONENTS_SYNC_DRIVER_DATA_TYPE_MANAGER_IMPL_H__