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/files/file_util.h" | 5 #include "base/files/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 "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
9 #include "chrome/browser/prefs/pref_service_syncable.h" | 9 #include "chrome/browser/prefs/pref_service_syncable.h" |
10 #include "chrome/browser/signin/fake_profile_oauth2_token_service.h" | 10 #include "chrome/browser/signin/fake_profile_oauth2_token_service.h" |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
68 TestProfileSyncServiceNoBackup( | 68 TestProfileSyncServiceNoBackup( |
69 scoped_ptr<ProfileSyncComponentsFactory> factory, | 69 scoped_ptr<ProfileSyncComponentsFactory> factory, |
70 Profile* profile, | 70 Profile* profile, |
71 scoped_ptr<SupervisedUserSigninManagerWrapper> signin_wrapper, | 71 scoped_ptr<SupervisedUserSigninManagerWrapper> signin_wrapper, |
72 ProfileOAuth2TokenService* oauth2_token_service, | 72 ProfileOAuth2TokenService* oauth2_token_service, |
73 browser_sync::ProfileSyncServiceStartBehavior start_behavior) | 73 browser_sync::ProfileSyncServiceStartBehavior start_behavior) |
74 : ProfileSyncService(factory.Pass(), profile, signin_wrapper.Pass(), | 74 : ProfileSyncService(factory.Pass(), profile, signin_wrapper.Pass(), |
75 oauth2_token_service, start_behavior) {} | 75 oauth2_token_service, start_behavior) {} |
76 | 76 |
77 protected: | 77 protected: |
78 virtual bool NeedBackup() const OVERRIDE { | 78 virtual bool NeedBackup() const override { |
79 return false; | 79 return false; |
80 } | 80 } |
81 }; | 81 }; |
82 | 82 |
83 class ProfileSyncServiceStartupTest : public testing::Test { | 83 class ProfileSyncServiceStartupTest : public testing::Test { |
84 public: | 84 public: |
85 ProfileSyncServiceStartupTest() | 85 ProfileSyncServiceStartupTest() |
86 : thread_bundle_(content::TestBrowserThreadBundle::REAL_DB_THREAD | | 86 : thread_bundle_(content::TestBrowserThreadBundle::REAL_DB_THREAD | |
87 content::TestBrowserThreadBundle::REAL_FILE_THREAD | | 87 content::TestBrowserThreadBundle::REAL_FILE_THREAD | |
88 content::TestBrowserThreadBundle::REAL_IO_THREAD), | 88 content::TestBrowserThreadBundle::REAL_IO_THREAD), |
(...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
572 profile_->GetPrefs()->ClearPref(sync_driver::prefs::kSyncHasSetupCompleted); | 572 profile_->GetPrefs()->ClearPref(sync_driver::prefs::kSyncHasSetupCompleted); |
573 | 573 |
574 EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber()); | 574 EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber()); |
575 sync_->Initialize(); | 575 sync_->Initialize(); |
576 | 576 |
577 sync_->SetSetupInProgress(true); | 577 sync_->SetSetupInProgress(true); |
578 IssueTestTokens(); | 578 IssueTestTokens(); |
579 sync_->SetSetupInProgress(false); | 579 sync_->SetSetupInProgress(false); |
580 EXPECT_FALSE(sync_->SyncActive()); | 580 EXPECT_FALSE(sync_->SyncActive()); |
581 } | 581 } |
OLD | NEW |