Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(12)

Side by Side Diff: chrome/browser/sync/profile_sync_service_startup_unittest.cc

Issue 513543004: [Sync] Rename FailedDataTypesHandler -> DataTypeStatusTable (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "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 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
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),
89 profile_manager_(TestingBrowserProcess::GetGlobal()), 89 profile_manager_(TestingBrowserProcess::GetGlobal()),
90 sync_(NULL), 90 sync_(NULL),
91 failed_data_types_handler_(NULL) {} 91 data_type_status_table_(NULL) {}
92 92
93 virtual ~ProfileSyncServiceStartupTest() { 93 virtual ~ProfileSyncServiceStartupTest() {
94 } 94 }
95 95
96 virtual void SetUp() { 96 virtual void SetUp() {
97 CHECK(profile_manager_.SetUp()); 97 CHECK(profile_manager_.SetUp());
98 98
99 TestingProfile::TestingFactories testing_facotries; 99 TestingProfile::TestingFactories testing_facotries;
100 testing_facotries.push_back( 100 testing_facotries.push_back(
101 std::make_pair(SigninManagerFactory::GetInstance(), 101 std::make_pair(SigninManagerFactory::GetInstance(),
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 142
143 ProfileSyncComponentsFactoryMock* components_factory_mock() { 143 ProfileSyncComponentsFactoryMock* components_factory_mock() {
144 return static_cast<ProfileSyncComponentsFactoryMock*>(sync_->factory()); 144 return static_cast<ProfileSyncComponentsFactoryMock*>(sync_->factory());
145 } 145 }
146 146
147 FakeSigninManagerForTesting* fake_signin() { 147 FakeSigninManagerForTesting* fake_signin() {
148 return static_cast<FakeSigninManagerForTesting*>(sync_->signin()); 148 return static_cast<FakeSigninManagerForTesting*>(sync_->signin());
149 } 149 }
150 150
151 void SetError() { 151 void SetError() {
152 sync_driver::FailedDataTypesHandler::TypeErrorMap errors; 152 sync_driver::DataTypeStatusTable::TypeErrorMap errors;
153 errors[syncer::BOOKMARKS] = 153 errors[syncer::BOOKMARKS] =
154 syncer::SyncError(FROM_HERE, 154 syncer::SyncError(FROM_HERE,
155 syncer::SyncError::UNRECOVERABLE_ERROR, 155 syncer::SyncError::UNRECOVERABLE_ERROR,
156 "Error", 156 "Error",
157 syncer::BOOKMARKS); 157 syncer::BOOKMARKS);
158 failed_data_types_handler_->UpdateFailedDataTypes(errors); 158 data_type_status_table_->UpdateFailedDataTypes(errors);
159 } 159 }
160 160
161 protected: 161 protected:
162 void SimulateTestUserSignin() { 162 void SimulateTestUserSignin() {
163 profile_->GetPrefs()->SetString(prefs::kGoogleServicesUsername, 163 profile_->GetPrefs()->SetString(prefs::kGoogleServicesUsername,
164 "test_user@gmail.com"); 164 "test_user@gmail.com");
165 #if !defined(OS_CHROMEOS) 165 #if !defined(OS_CHROMEOS)
166 fake_signin()->SignIn("test_user@gmail.com", ""); 166 fake_signin()->SignIn("test_user@gmail.com", "");
167 #else 167 #else
168 fake_signin()->SetAuthenticatedUsername("test_user@gmail.com"); 168 fake_signin()->SetAuthenticatedUsername("test_user@gmail.com");
169 sync_->GoogleSigninSucceeded("test_user@gmail.com", ""); 169 sync_->GoogleSigninSucceeded("test_user@gmail.com", "");
170 #endif 170 #endif
171 } 171 }
172 172
173 DataTypeManagerMock* SetUpDataTypeManager() { 173 DataTypeManagerMock* SetUpDataTypeManager() {
174 DataTypeManagerMock* data_type_manager = new DataTypeManagerMock(); 174 DataTypeManagerMock* data_type_manager = new DataTypeManagerMock();
175 EXPECT_CALL(*components_factory_mock(), 175 EXPECT_CALL(*components_factory_mock(),
176 CreateDataTypeManager(_, _, _, _, _, _)). 176 CreateDataTypeManager(_, _, _, _, _, _)).
177 WillOnce(DoAll(SaveArg<5>(&failed_data_types_handler_), 177 WillOnce(DoAll(SaveArg<5>(&data_type_status_table_),
178 Return(data_type_manager))); 178 Return(data_type_manager)));
179 return data_type_manager; 179 return data_type_manager;
180 } 180 }
181 181
182 browser_sync::SyncBackendHostMock* SetUpSyncBackendHost() { 182 browser_sync::SyncBackendHostMock* SetUpSyncBackendHost() {
183 browser_sync::SyncBackendHostMock* sync_backend_host = 183 browser_sync::SyncBackendHostMock* sync_backend_host =
184 new browser_sync::SyncBackendHostMock(); 184 new browser_sync::SyncBackendHostMock();
185 EXPECT_CALL(*components_factory_mock(), 185 EXPECT_CALL(*components_factory_mock(),
186 CreateSyncBackendHost(_, _, _, _, _)). 186 CreateSyncBackendHost(_, _, _, _, _)).
187 WillOnce(Return(sync_backend_host)); 187 WillOnce(Return(sync_backend_host));
188 return sync_backend_host; 188 return sync_backend_host;
189 } 189 }
190 190
191 content::TestBrowserThreadBundle thread_bundle_; 191 content::TestBrowserThreadBundle thread_bundle_;
192 TestingProfileManager profile_manager_; 192 TestingProfileManager profile_manager_;
193 TestingProfile* profile_; 193 TestingProfile* profile_;
194 ProfileSyncService* sync_; 194 ProfileSyncService* sync_;
195 ProfileSyncServiceObserverMock observer_; 195 ProfileSyncServiceObserverMock observer_;
196 sync_driver::FailedDataTypesHandler* failed_data_types_handler_; 196 sync_driver::DataTypeStatusTable* data_type_status_table_;
197 }; 197 };
198 198
199 class ProfileSyncServiceStartupCrosTest : public ProfileSyncServiceStartupTest { 199 class ProfileSyncServiceStartupCrosTest : public ProfileSyncServiceStartupTest {
200 public: 200 public:
201 virtual void SetUp() { 201 virtual void SetUp() {
202 ProfileSyncServiceStartupTest::SetUp(); 202 ProfileSyncServiceStartupTest::SetUp();
203 sync_ = static_cast<ProfileSyncService*>( 203 sync_ = static_cast<ProfileSyncService*>(
204 ProfileSyncServiceFactory::GetInstance()->SetTestingFactoryAndUse( 204 ProfileSyncServiceFactory::GetInstance()->SetTestingFactoryAndUse(
205 profile_, BuildCrosService)); 205 profile_, BuildCrosService));
206 sync_->AddObserver(&observer_); 206 sync_->AddObserver(&observer_);
(...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after
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_->sync_initialized()); 580 EXPECT_FALSE(sync_->sync_initialized());
581 } 581 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/profile_sync_service.cc ('k') | chrome/browser/sync/profile_sync_service_typed_url_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698