OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/file_util.h" | 5 #include "base/file_util.h" |
6 #include "base/memory/scoped_ptr.h" | 6 #include "base/memory/scoped_ptr.h" |
7 #include "base/prefs/pref_service.h" | 7 #include "base/prefs/pref_service.h" |
8 #include "chrome/browser/chrome_notification_types.h" | 8 #include "chrome/browser/chrome_notification_types.h" |
9 #include "chrome/browser/signin/fake_signin_manager.h" | 9 #include "chrome/browser/signin/fake_signin_manager.h" |
10 #include "chrome/browser/signin/profile_oauth2_token_service.h" | 10 #include "chrome/browser/signin/profile_oauth2_token_service.h" |
11 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" | 11 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" |
12 #include "chrome/browser/signin/signin_manager.h" | 12 #include "chrome/browser/signin/signin_manager.h" |
13 #include "chrome/browser/signin/signin_manager_factory.h" | 13 #include "chrome/browser/signin/signin_manager_factory.h" |
14 #include "chrome/browser/sync/fake_oauth2_token_service.h" | 14 #include "chrome/browser/sync/fake_oauth2_token_service_for_sync.h" |
15 #include "chrome/browser/sync/glue/data_type_manager.h" | 15 #include "chrome/browser/sync/glue/data_type_manager.h" |
16 #include "chrome/browser/sync/glue/data_type_manager_mock.h" | 16 #include "chrome/browser/sync/glue/data_type_manager_mock.h" |
17 #include "chrome/browser/sync/glue/sync_backend_host_mock.h" | 17 #include "chrome/browser/sync/glue/sync_backend_host_mock.h" |
18 #include "chrome/browser/sync/profile_sync_components_factory_mock.h" | 18 #include "chrome/browser/sync/profile_sync_components_factory_mock.h" |
19 #include "chrome/browser/sync/profile_sync_service_factory.h" | 19 #include "chrome/browser/sync/profile_sync_service_factory.h" |
20 #include "chrome/browser/sync/profile_sync_test_util.h" | 20 #include "chrome/browser/sync/profile_sync_test_util.h" |
21 #include "chrome/browser/sync/sync_prefs.h" | 21 #include "chrome/browser/sync/sync_prefs.h" |
22 #include "chrome/common/pref_names.h" | 22 #include "chrome/common/pref_names.h" |
23 #include "chrome/test/base/testing_profile.h" | 23 #include "chrome/test/base/testing_profile.h" |
24 #include "content/public/browser/notification_service.h" | 24 #include "content/public/browser/notification_service.h" |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
74 virtual scoped_ptr<TestingProfile> CreateProfile() { | 74 virtual scoped_ptr<TestingProfile> CreateProfile() { |
75 TestingProfile::Builder builder; | 75 TestingProfile::Builder builder; |
76 #if defined(OS_CHROMEOS) | 76 #if defined(OS_CHROMEOS) |
77 builder.AddTestingFactory(SigninManagerFactory::GetInstance(), | 77 builder.AddTestingFactory(SigninManagerFactory::GetInstance(), |
78 FakeSigninManagerBase::Build); | 78 FakeSigninManagerBase::Build); |
79 #else | 79 #else |
80 builder.AddTestingFactory(SigninManagerFactory::GetInstance(), | 80 builder.AddTestingFactory(SigninManagerFactory::GetInstance(), |
81 FakeSigninManager::Build); | 81 FakeSigninManager::Build); |
82 #endif | 82 #endif |
83 builder.AddTestingFactory(ProfileOAuth2TokenServiceFactory::GetInstance(), | 83 builder.AddTestingFactory(ProfileOAuth2TokenServiceFactory::GetInstance(), |
84 FakeOAuth2TokenService::BuildTokenService); | 84 FakeOAuth2TokenServiceForSync::BuildTokenService); |
85 builder.AddTestingFactory(ProfileSyncServiceFactory::GetInstance(), | 85 builder.AddTestingFactory(ProfileSyncServiceFactory::GetInstance(), |
86 BuildService); | 86 BuildService); |
87 return builder.Build(); | 87 return builder.Build(); |
88 } | 88 } |
89 | 89 |
90 virtual void TearDown() { | 90 virtual void TearDown() { |
91 sync_->RemoveObserver(&observer_); | 91 sync_->RemoveObserver(&observer_); |
92 profile_.reset(); | 92 profile_.reset(); |
93 } | 93 } |
94 | 94 |
(...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
522 profile_->GetPrefs()->ClearPref(prefs::kSyncHasSetupCompleted); | 522 profile_->GetPrefs()->ClearPref(prefs::kSyncHasSetupCompleted); |
523 | 523 |
524 EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber()); | 524 EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber()); |
525 IssueTestTokens(); | 525 IssueTestTokens(); |
526 | 526 |
527 sync_->SetSetupInProgress(true); | 527 sync_->SetSetupInProgress(true); |
528 sync_->Initialize(); | 528 sync_->Initialize(); |
529 sync_->SetSetupInProgress(false); | 529 sync_->SetSetupInProgress(false); |
530 EXPECT_FALSE(sync_->sync_initialized()); | 530 EXPECT_FALSE(sync_->sync_initialized()); |
531 } | 531 } |
OLD | NEW |