[USS] TypedURLSyncMetadataDatabase inherits SyncMetadataStores

components/history/core/browser/typed_url_sync_metadata_database_unittest.cc

Index: components/history/core/browser/typed_url_sync_metadata_database_unittest.cc
diff --git a/components/history/core/browser/typed_url_sync_metadata_database_unittest.cc b/components/history/core/browser/typed_url_sync_metadata_database_unittest.cc
index 31810c615ea0b4afa0d9893ab6839464693f1f28..c37bf3eeb7ec19d2ea3f094dbb74b0e7741a4123 100644
--- a/components/history/core/browser/typed_url_sync_metadata_database_unittest.cc
+++ b/components/history/core/browser/typed_url_sync_metadata_database_unittest.cc
@@ -64,15 +64,15 @@ TEST_F(TypedURLSyncMetadataDatabaseTest, TypedURLGetAllSyncMetadata) {
   std::string storage_key2 = "2";
   metadata.set_sequence_number(1);
 
-  EXPECT_TRUE(UpdateSyncMetadata(storage_key, metadata));
+  EXPECT_TRUE(UpdateSyncMetadata(syncer::TYPED_URLS, storage_key, metadata));
 
   ModelTypeState model_type_state;
   model_type_state.set_initial_sync_done(true);
 
-  EXPECT_TRUE(UpdateModelTypeState(model_type_state));
+  EXPECT_TRUE(UpdateModelTypeState(syncer::TYPED_URLS, model_type_state));
 
   metadata.set_sequence_number(2);
-  EXPECT_TRUE(UpdateSyncMetadata(storage_key2, metadata));
+  EXPECT_TRUE(UpdateSyncMetadata(syncer::TYPED_URLS, storage_key2, metadata));
 
   MetadataBatch metadata_batch;
   EXPECT_TRUE(GetAllSyncMetadata(&metadata_batch));
@@ -87,7 +87,7 @@ TEST_F(TypedURLSyncMetadataDatabaseTest, TypedURLGetAllSyncMetadata) {
 
   // Now check that a model type state update replaces the old value
   model_type_state.set_initial_sync_done(false);
-  EXPECT_TRUE(UpdateModelTypeState(model_type_state));
+  EXPECT_TRUE(UpdateModelTypeState(syncer::TYPED_URLS, model_type_state));
 
   EXPECT_TRUE(GetAllSyncMetadata(&metadata_batch));
   EXPECT_FALSE(metadata_batch.GetModelTypeState().initial_sync_done());
@@ -104,10 +104,10 @@ TEST_F(TypedURLSyncMetadataDatabaseTest, TypedURLWriteThenDeleteSyncMetadata) {
   metadata.set_client_tag_hash("client_hash");
 
   // Write the data into the store.
-  EXPECT_TRUE(UpdateSyncMetadata(storage_key, metadata));
-  EXPECT_TRUE(UpdateModelTypeState(model_type_state));
+  EXPECT_TRUE(UpdateSyncMetadata(syncer::TYPED_URLS, storage_key, metadata));
+  EXPECT_TRUE(UpdateModelTypeState(syncer::TYPED_URLS, model_type_state));
   // Delete the data we just wrote.
-  EXPECT_TRUE(ClearSyncMetadata(storage_key));
+  EXPECT_TRUE(ClearSyncMetadata(syncer::TYPED_URLS, storage_key));
   // It shouldn't be there any more.
   EXPECT_TRUE(GetAllSyncMetadata(&metadata_batch));
 
@@ -115,7 +115,7 @@ TEST_F(TypedURLSyncMetadataDatabaseTest, TypedURLWriteThenDeleteSyncMetadata) {
   EXPECT_EQ(metadata_records.size(), 0u);
 
   // Now delete the model type state.
-  EXPECT_TRUE(ClearModelTypeState());
+  EXPECT_TRUE(ClearModelTypeState(syncer::TYPED_URLS));
   EXPECT_TRUE(GetAllSyncMetadata(&metadata_batch));
   EXPECT_EQ(ModelTypeState().SerializeAsString(),
             metadata_batch.GetModelTypeState().SerializeAsString());