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

chrome/browser/sync/profile_sync_service_unittest.cc

 // 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.
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 40 matching lines @@
   virtual ~FakeDataTypeManager() {};
 
   virtual void Configure(syncer::ModelTypeSet desired_types,
                          syncer::ConfigureReason reason) OVERRIDE {
     sync_driver::DataTypeManager::ConfigureResult result;
     result.status = sync_driver::DataTypeManager::OK;
     observer_->OnConfigureDone(result);
   }
 
   virtual void ReenableType(syncer::ModelType type) OVERRIDE {}
-  virtual void ResetDataTypeErrors() OVERRIDE {}
   virtual void PurgeForMigration(syncer::ModelTypeSet undesired_types,
                                  syncer::ConfigureReason reason) OVERRIDE {}
   virtual void Stop() OVERRIDE {};
   virtual State state() const OVERRIDE {
     return sync_driver::DataTypeManager::CONFIGURED;
   };
 
  private:
   sync_driver::DataTypeManagerObserver* observer_;
 };
@@ skipping 173 matching lines @@
     sync_driver::SyncPrefs sync_prefs(service()->profile()->GetPrefs());
     sync_prefs.SetFirstSyncTime(base::Time::Now());
     service_->Initialize();
   }
 
   void InitializeForFirstSync() {
     service_->Initialize();
   }
 
   void ExpectDataTypeManagerCreation(int times) {
-    EXPECT_CALL(*components_factory_, CreateDataTypeManager(_, _, _, _, _))
+    EXPECT_CALL(*components_factory_, CreateDataTypeManager(_, _, _, _, _, _))
         .Times(times)
         .WillRepeatedly(ReturnNewDataTypeManager());
   }
 
   void ExpectSyncBackendHostCreation(int times) {
     EXPECT_CALL(*components_factory_, CreateSyncBackendHost(_, _, _, _, _))
         .Times(times)
         .WillRepeatedly(ReturnNewSyncBackendHostMock());
   }
 
@@ skipping 345 matching lines @@
   // See that we can override the URL with a flag.
   CommandLine command_line(
       base::FilePath(base::FilePath(FILE_PATH_LITERAL("chrome.exe"))));
   command_line.AppendSwitchASCII(switches::kSyncServiceURL, "https://foo/bar");
   EXPECT_EQ("https://foo/bar",
             ProfileSyncService::GetSyncServiceURL(command_line).spec());
 }
 
 }  // namespace
 }  // namespace browser_sync