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

Unified Diff: sync/internal_api/sync_context_proxy_impl_unittest.cc

Issue 1671773002: [Sync] USS: Rename SharedModelTypeProcessor::Start and related methods. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@smtp
Patch Set: Rebase. Created 4 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sync/internal_api/shared_model_type_processor_unittest.cc ('k') | sync/sessions/model_type_registry.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/internal_api/sync_context_proxy_impl_unittest.cc
diff --git a/sync/internal_api/sync_context_proxy_impl_unittest.cc b/sync/internal_api/sync_context_proxy_impl_unittest.cc
index 0319dd27ad4bf58d0b7f4505ca4e27d64e92087f..6058d67ee4a685c750589aa39d973571656adf8b 100644
--- a/sync/internal_api/sync_context_proxy_impl_unittest.cc
+++ b/sync/internal_api/sync_context_proxy_impl_unittest.cc
@@ -48,13 +48,13 @@ class SyncContextProxyImplTest : public ::testing::Test, FakeModelTypeService {
// function simulates such an event.
void DisableSync() { registry_.reset(); }
- void Start(SharedModelTypeProcessor* processor) {
- processor->Start(base::Bind(&SyncContextProxyImplTest::StartDone,
- base::Unretained(this)));
+ void OnSyncStarting(SharedModelTypeProcessor* processor) {
+ processor->OnSyncStarting(base::Bind(
+ &SyncContextProxyImplTest::OnReadyToConnect, base::Unretained(this)));
}
- void StartDone(syncer::SyncError error,
- scoped_ptr<ActivationContext> context) {
+ void OnReadyToConnect(syncer::SyncError error,
+ scoped_ptr<ActivationContext> context) {
context_proxy_->ConnectTypeToSync(syncer::THEMES, std::move(context));
}
@@ -82,7 +82,7 @@ class SyncContextProxyImplTest : public ::testing::Test, FakeModelTypeService {
TEST_F(SyncContextProxyImplTest, FailToConnect1) {
scoped_ptr<SharedModelTypeProcessor> processor = CreateModelTypeProcessor();
DisableSync();
- Start(processor.get());
+ OnSyncStarting(processor.get());
base::RunLoop run_loop_;
run_loop_.RunUntilIdle();
@@ -92,7 +92,7 @@ TEST_F(SyncContextProxyImplTest, FailToConnect1) {
// Try to connect a type to a SyncContext as it shuts down.
TEST_F(SyncContextProxyImplTest, FailToConnect2) {
scoped_ptr<SharedModelTypeProcessor> processor = CreateModelTypeProcessor();
- Start(processor.get());
+ OnSyncStarting(processor.get());
DisableSync();
base::RunLoop run_loop_;
@@ -103,7 +103,7 @@ TEST_F(SyncContextProxyImplTest, FailToConnect2) {
// Tests the case where the type's sync proxy shuts down first.
TEST_F(SyncContextProxyImplTest, TypeDisconnectsFirst) {
scoped_ptr<SharedModelTypeProcessor> processor = CreateModelTypeProcessor();
- Start(processor.get());
+ OnSyncStarting(processor.get());
base::RunLoop run_loop_;
run_loop_.RunUntilIdle();
@@ -115,7 +115,7 @@ TEST_F(SyncContextProxyImplTest, TypeDisconnectsFirst) {
// Tests the case where the sync thread shuts down first.
TEST_F(SyncContextProxyImplTest, SyncDisconnectsFirst) {
scoped_ptr<SharedModelTypeProcessor> processor = CreateModelTypeProcessor();
- Start(processor.get());
+ OnSyncStarting(processor.get());
base::RunLoop run_loop_;
run_loop_.RunUntilIdle();
« no previous file with comments | « sync/internal_api/shared_model_type_processor_unittest.cc ('k') | sync/sessions/model_type_registry.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698