Reland 87645 with clang fixes.

chrome/browser/sync/profile_sync_service_startup_unittest.cc

 // Copyright (c) 2011 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 "testing/gtest/include/gtest/gtest.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "chrome/browser/net/gaia/token_service.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ skipping 257 matching lines @@
       service_->GetClearServerDataState());
 
   // Stop the timer and reset the state
   EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber());
   service_->OnClearServerDataSucceeded();
   service_->ResetClearServerDataState();
 }
 
 TEST_F(ProfileSyncServiceStartupTest, StartFailure) {
   DataTypeManagerMock* data_type_manager = SetUpDataTypeManager();
-  DataTypeManager::ConfigureResult configure_result =
+  DataTypeManager::ConfigureStatus status =
       DataTypeManager::ASSOCIATION_FAILED;
-  browser_sync::DataTypeManager::ConfigureResultWithErrorLocation result(
-      configure_result, FROM_HERE, syncable::ModelTypeSet());
+  browser_sync::DataTypeManager::ConfigureResult result(
+      status,
+      syncable::ModelTypeSet(),
+      syncable::ModelTypeSet(),
+      FROM_HERE);
   EXPECT_CALL(*data_type_manager, Configure(_, _)).
       WillRepeatedly(
           DoAll(
               NotifyFromDataTypeManager(data_type_manager,
                   static_cast<int>(chrome::NOTIFICATION_SYNC_CONFIGURE_START)),
               NotifyFromDataTypeManagerWithResult(data_type_manager,
                   static_cast<int>(chrome::NOTIFICATION_SYNC_CONFIGURE_DONE),
                   &result)));
   EXPECT_CALL(*data_type_manager, state()).
       WillOnce(Return(DataTypeManager::STOPPED));
@@ skipping 14 matching lines @@
 
   // Preload the tokens.
   profile_.GetTokenService()->IssueAuthTokenForTest(
       GaiaConstants::kSyncService, "sync_token");
   service_->fail_initial_download();
 
   service_->Initialize();
   EXPECT_FALSE(service_->sync_initialized());
   EXPECT_FALSE(service_->GetBackendForTest());
 }