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

Unified Diff: components/sync/model/model_type_sync_bridge_unittest.cc

Issue 2621373004: [Sync] Renamed OnMetadataLoaded to ModelReadyToSync. (Closed)
Patch Set: Rebase. Created 3 years, 11 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
Index: components/sync/model/model_type_sync_bridge_unittest.cc
diff --git a/components/sync/model/model_type_sync_bridge_unittest.cc b/components/sync/model/model_type_sync_bridge_unittest.cc
index 51dd4c05c7ad677e7af459cfcf629a956f75f7e4..7b30935a4ef9ab2ad67e7b571ccb232630c12be3 100644
--- a/components/sync/model/model_type_sync_bridge_unittest.cc
+++ b/components/sync/model/model_type_sync_bridge_unittest.cc
@@ -16,7 +16,7 @@
namespace syncer {
-// A mock MTCP that lets verify DisableSync and OnMetadataLoaded were called in
+// A mock MTCP that lets verify DisableSync and ModelReadyToSync were called in
// the ways that we expect.
class MockModelTypeChangeProcessor : public FakeModelTypeChangeProcessor {
public:
@@ -26,13 +26,11 @@ class MockModelTypeChangeProcessor : public FakeModelTypeChangeProcessor {
void DisableSync() override { disabled_callback_.Run(); }
- void OnMetadataLoaded(std::unique_ptr<MetadataBatch> batch) override {
- on_metadata_loaded_batch_ = std::move(batch);
+ void ModelReadyToSync(std::unique_ptr<MetadataBatch> batch) override {
+ metadata_batch_ = std::move(batch);
}
- MetadataBatch* on_metadata_loaded_batch() {
- return on_metadata_loaded_batch_.get();
- }
+ MetadataBatch* metadata_batch() { return metadata_batch_.get(); }
private:
// This callback is invoked when DisableSync() is called, instead of
@@ -42,7 +40,7 @@ class MockModelTypeChangeProcessor : public FakeModelTypeChangeProcessor {
// allows this information to reach somewhere safe instead.
base::Closure disabled_callback_;
- std::unique_ptr<MetadataBatch> on_metadata_loaded_batch_;
+ std::unique_ptr<MetadataBatch> metadata_batch_;
};
class MockModelTypeSyncBridge : public StubModelTypeSyncBridge {
@@ -120,8 +118,7 @@ TEST_F(ModelTypeSyncBridgeTest, DisableSync) {
// processor about this.
EXPECT_TRUE(bridge()->processor_disable_sync_called());
- MetadataBatch* batch =
- bridge()->change_processor()->on_metadata_loaded_batch();
+ MetadataBatch* batch = bridge()->change_processor()->metadata_batch();
EXPECT_NE(nullptr, batch);
EXPECT_EQ(sync_pb::ModelTypeState().SerializeAsString(),
batch->GetModelTypeState().SerializeAsString());
« no previous file with comments | « components/sync/model/model_type_sync_bridge.cc ('k') | components/sync/model_impl/shared_model_type_processor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698