diff options
Diffstat (limited to 'chrome/browser/sync/profile_sync_service_unittest.cc')
| -rw-r--r-- | chrome/browser/sync/profile_sync_service_unittest.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/chrome/browser/sync/profile_sync_service_unittest.cc b/chrome/browser/sync/profile_sync_service_unittest.cc index 1d638ae..7c8913c 100644 --- a/chrome/browser/sync/profile_sync_service_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// 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. @@ -6,13 +6,13 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/values.h" -#include "chrome/browser/net/gaia/token_service.h" +#include "chrome/browser/signin/signin_manager.h" +#include "chrome/browser/signin/token_service.h" #include "chrome/browser/sync/glue/bookmark_data_type_controller.h" #include "chrome/browser/sync/glue/data_type_controller.h" #include "chrome/browser/sync/js/js_arg_list.h" #include "chrome/browser/sync/js/js_event_details.h" #include "chrome/browser/sync/js/js_test_util.h" -#include "chrome/browser/sync/signin_manager.h" #include "chrome/browser/sync/profile_sync_components_factory_mock.h" #include "chrome/browser/sync/test_profile_sync_service.h" #include "chrome/common/chrome_version_info.h" @@ -91,7 +91,7 @@ class ProfileSyncServiceTest : public testing::Test { bool sync_setup_completed, bool expect_create_dtm) { if (!service_.get()) { - SigninManager* signin = new SigninManager(); + SigninManager* signin = profile_->GetSigninManager(); signin->SetAuthenticatedUsername("test"); service_.reset(new TestProfileSyncService(&factory_, profile_.get(), @@ -144,7 +144,7 @@ class ProfileSyncServiceTest : public testing::Test { TEST_F(ProfileSyncServiceTest, InitialState) { service_.reset(new TestProfileSyncService(&factory_, profile_.get(), - new SigninManager(), + profile_->GetSigninManager(), ProfileSyncService::MANUAL_START, true, base::Closure())); @@ -161,7 +161,7 @@ TEST_F(ProfileSyncServiceTest, DisabledByPolicy) { Value::CreateBooleanValue(true)); service_.reset(new TestProfileSyncService(&factory_, profile_.get(), - new SigninManager(), + profile_->GetSigninManager(), ProfileSyncService::MANUAL_START, true, base::Closure())); @@ -170,7 +170,7 @@ TEST_F(ProfileSyncServiceTest, DisabledByPolicy) { } TEST_F(ProfileSyncServiceTest, AbortedByShutdown) { - SigninManager* signin = new SigninManager(); + SigninManager* signin = profile_->GetSigninManager(); signin->SetAuthenticatedUsername("test"); service_.reset(new TestProfileSyncService(&factory_, profile_.get(), @@ -190,7 +190,7 @@ TEST_F(ProfileSyncServiceTest, AbortedByShutdown) { } TEST_F(ProfileSyncServiceTest, DisableAndEnableSyncTemporarily) { - SigninManager* signin = new SigninManager(); + SigninManager* signin = profile_->GetSigninManager(); signin->SetAuthenticatedUsername("test"); service_.reset(new TestProfileSyncService(&factory_, profile_.get(), |