Revert "[Sync] Move DataTypeStatusTable ownership into DataTypeManager."

chrome/browser/sync/profile_sync_components_factory_mock.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_SYNC_PROFILE_SYNC_COMPONENTS_FACTORY_MOCK_H__
 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_COMPONENTS_FACTORY_MOCK_H__
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/sync/profile_sync_components_factory.h"
 #include "chrome/browser/sync/profile_sync_service.h"
@@ skipping 10 matching lines @@
 
 class ProfileSyncComponentsFactoryMock : public ProfileSyncComponentsFactory {
  public:
   ProfileSyncComponentsFactoryMock();
   ProfileSyncComponentsFactoryMock(
       sync_driver::AssociatorInterface* model_associator,
       sync_driver::ChangeProcessor* change_processor);
   virtual ~ProfileSyncComponentsFactoryMock();
 
   MOCK_METHOD1(RegisterDataTypes, void(ProfileSyncService*));
-  MOCK_METHOD5(CreateDataTypeManager,
+  MOCK_METHOD6(CreateDataTypeManager,
                sync_driver::DataTypeManager*(
                    const syncer::WeakHandle<syncer::DataTypeDebugInfoListener>&,
                    const sync_driver::DataTypeController::TypeMap*,
                    const sync_driver::DataTypeEncryptionHandler*,
                    browser_sync::SyncBackendHost*,
-                   sync_driver::DataTypeManagerObserver* observer));
+                   sync_driver::DataTypeManagerObserver* observer,
+                   sync_driver::DataTypeStatusTable*
+                       data_type_status_table));
   MOCK_METHOD5(CreateSyncBackendHost,
                browser_sync::SyncBackendHost*(
                    const std::string& name,
                    Profile* profile,
                    invalidation::InvalidationService* invalidator,
                    const base::WeakPtr<sync_driver::SyncPrefs>& sync_prefs,
                    const base::FilePath& sync_folder));
 
   virtual scoped_ptr<browser_sync::LocalDeviceInfoProvider>
       CreateLocalDeviceInfoProvider() OVERRIDE;
@@ skipping 23 matching lines @@
   SyncComponents MakeSyncComponents();
 
   scoped_ptr<sync_driver::AssociatorInterface> model_associator_;
   scoped_ptr<sync_driver::ChangeProcessor> change_processor_;
   // LocalDeviceInfoProvider is initially owned by this class,
   // transferred to caller when CreateLocalDeviceInfoProvider is called.
   scoped_ptr<browser_sync::LocalDeviceInfoProvider> local_device_;
 };
 
 #endif  // CHROME_BROWSER_SYNC_PROFILE_SYNC_COMPONENTS_FACTORY_MOCK_H__