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

Side by Side Diff: components/browser_sync/profile_sync_service_startup_unittest.cc

Issue 2961673002: [sync] Fix IsSyncConfirmationNeeded crash when local backend is enabled (Closed)
Patch Set: Fix cros test Created 3 years, 5 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 "components/browser_sync/profile_sync_service.h" 5 #include "components/browser_sync/profile_sync_service.h"
6 6
7 #include "base/files/file_util.h" 7 #include "base/files/file_util.h"
8 #include "base/memory/ptr_util.h" 8 #include "base/memory/ptr_util.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 // Then start things up. 188 // Then start things up.
189 EXPECT_CALL(*data_type_manager, Configure(_, _)).Times(1); 189 EXPECT_CALL(*data_type_manager, Configure(_, _)).Times(1);
190 EXPECT_CALL(*data_type_manager, state()) 190 EXPECT_CALL(*data_type_manager, state())
191 .WillOnce(Return(DataTypeManager::CONFIGURED)) 191 .WillOnce(Return(DataTypeManager::CONFIGURED))
192 .WillOnce(Return(DataTypeManager::CONFIGURED)); 192 .WillOnce(Return(DataTypeManager::CONFIGURED));
193 EXPECT_CALL(*data_type_manager, Stop()).Times(1); 193 EXPECT_CALL(*data_type_manager, Stop()).Times(1);
194 EXPECT_CALL(observer_, OnStateChanged(_)).Times(AnyNumber()); 194 EXPECT_CALL(observer_, OnStateChanged(_)).Times(AnyNumber());
195 195
196 auto sync_blocker = sync_service_->GetSetupInProgressHandle(); 196 auto sync_blocker = sync_service_->GetSetupInProgressHandle();
197 197
198 // Confirmation isn't needed before sign in occurs.
199 EXPECT_FALSE(sync_service_->IsSyncConfirmationNeeded());
200
198 // Simulate successful signin as test_user. 201 // Simulate successful signin as test_user.
199 std::string account_id = SimulateTestUserSignin(sync_service_.get()); 202 std::string account_id = SimulateTestUserSignin(sync_service_.get());
200 ON_CALL(*data_type_manager, IsNigoriEnabled()).WillByDefault(Return(true)); 203 ON_CALL(*data_type_manager, IsNigoriEnabled()).WillByDefault(Return(true));
201 // Create some tokens in the token service. 204 // Create some tokens in the token service.
202 IssueTestTokens(account_id); 205 IssueTestTokens(account_id);
203 206
204 // Simulate the UI telling sync it has finished setting up. 207 // Simulate the UI telling sync it has finished setting up.
205 sync_blocker.reset(); 208 sync_blocker.reset();
206 sync_service_->SetFirstSetupComplete(); 209 sync_service_->SetFirstSetupComplete();
207 EXPECT_TRUE(sync_service_->IsSyncActive()); 210 EXPECT_TRUE(sync_service_->IsSyncActive());
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
474 EXPECT_CALL(observer_, OnStateChanged(_)).Times(AnyNumber()); 477 EXPECT_CALL(observer_, OnStateChanged(_)).Times(AnyNumber());
475 sync_service_->Initialize(); 478 sync_service_->Initialize();
476 479
477 auto sync_blocker = sync_service_->GetSetupInProgressHandle(); 480 auto sync_blocker = sync_service_->GetSetupInProgressHandle();
478 IssueTestTokens(account_id); 481 IssueTestTokens(account_id);
479 sync_blocker.reset(); 482 sync_blocker.reset();
480 EXPECT_FALSE(sync_service_->IsSyncActive()); 483 EXPECT_FALSE(sync_service_->IsSyncActive());
481 } 484 }
482 485
483 } // namespace browser_sync 486 } // namespace browser_sync
OLDNEW
« no previous file with comments | « components/browser_sync/profile_sync_service.cc ('k') | components/browser_sync/profile_sync_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698