Chromium Code Reviews| Index: sync/internal_api/shared_model_type_processor_unittest.cc |
| diff --git a/sync/internal_api/shared_model_type_processor_unittest.cc b/sync/internal_api/shared_model_type_processor_unittest.cc |
| index 1e6a7f79ef8dd908d928a7a77c89ea93438f56be..9907b2317c217399e56b7bbbc0bc961c2bb02d7b 100644 |
| --- a/sync/internal_api/shared_model_type_processor_unittest.cc |
| +++ b/sync/internal_api/shared_model_type_processor_unittest.cc |
| @@ -146,10 +146,16 @@ class SharedModelTypeProcessorTest : public ::testing::Test, |
| ~SharedModelTypeProcessorTest() override {} |
| + syncer::ModelType type() const override { return kModelType; } |
| + |
| void CreateProcessor() { |
|
maxbogue
2016/03/22 21:40:12
I think you should be able to remove this and just
Gang Wu
2016/03/24 15:56:27
Done.
|
| ASSERT_FALSE(type_processor()); |
| - set_change_processor( |
| - make_scoped_ptr(new SharedModelTypeProcessor(kModelType, this))); |
| + ASSERT_TRUE(create_change_processor()); |
| + } |
| + |
| + scoped_ptr<ModelTypeChangeProcessor> CreateSharedModelTypeProcessor( |
|
maxbogue
2016/03/22 21:40:12
This should be removed. I'm pretty sure it's not d
Gang Wu
2016/03/24 15:56:26
Done.
|
| + ModelTypeService* service) { |
| + return make_scoped_ptr(new SharedModelTypeProcessor(kModelType, service)); |
| } |
| void InitializeToMetadataLoaded() { |
| @@ -356,7 +362,7 @@ class SharedModelTypeProcessorTest : public ::testing::Test, |
| } |
| // Return the number of entities the processor has metadata for. |
| - size_t ProcessorEntityCount() const { |
|
maxbogue
2016/03/22 21:40:12
Why removing const?
Gang Wu
2016/03/24 15:56:27
Done.
|
| + size_t ProcessorEntityCount() { |
| DCHECK(type_processor()); |
| return type_processor()->entities_.size(); |
| } |
| @@ -387,7 +393,7 @@ class SharedModelTypeProcessorTest : public ::testing::Test, |
| MockCommitQueue* mock_queue() { return mock_queue_; } |
| - SharedModelTypeProcessor* type_processor() const { |
|
maxbogue
2016/03/22 21:40:12
Keep const?
Gang Wu
2016/03/24 15:56:26
Done.
|
| + SharedModelTypeProcessor* type_processor() { |
| return static_cast<SharedModelTypeProcessor*>(change_processor()); |
| } |