[USS] Add function for update storage key for processor

components/sync/model/fake_model_type_sync_bridge.cc

Index: components/sync/model/fake_model_type_sync_bridge.cc
diff --git a/components/sync/model/fake_model_type_sync_bridge.cc b/components/sync/model/fake_model_type_sync_bridge.cc
index 0aea9329b63b4918d180d2d5d58287f589eb6e50..4fbdbd28430b616794ebcccffbd6991cd3aa78ce 100644
--- a/components/sync/model/fake_model_type_sync_bridge.cc
+++ b/components/sync/model/fake_model_type_sync_bridge.cc
@@ -21,20 +21,6 @@ namespace syncer {
 
 namespace {
 
-// It is intentionally very difficult to copy an EntityData, as in normal code
-// we never want to. However, since we store the data as an EntityData for the
-// test code here, this function is needed to manually copy it.
-std::unique_ptr<EntityData> CopyEntityData(const EntityData& old_data) {
-  std::unique_ptr<EntityData> new_data(new EntityData());
-  new_data->id = old_data.id;
-  new_data->client_tag_hash = old_data.client_tag_hash;
-  new_data->non_unique_name = old_data.non_unique_name;
-  new_data->specifics = old_data.specifics;
-  new_data->creation_time = old_data.creation_time;
-  new_data->modification_time = old_data.modification_time;
-  return new_data;
-}
-
 // A simple InMemoryMetadataChangeList that provides accessors for its data.
 class TestMetadataChangeList : public InMemoryMetadataChangeList {
  public:
@@ -262,7 +248,6 @@ void FakeModelTypeSyncBridge::ApplyMetadataChangeList(
         db_->PutMetadata(kv.first, kv.second.metadata);
         break;
       case TestMetadataChangeList::CLEAR:
-        EXPECT_TRUE(db_->HasMetadata(kv.first));

[pavely, 2017/05/09 00:49:24]

Why is this assertion not valid anymore? Is there a valid scenario where it
fails.

[Gang Wu, 2017/05/09 22:33:15]

yes, since now the processor will add an invalid storage key, and then delete it
and add a valid storage key, so db_ does not have invalid storage key yet when
delete the invalid storage key, so this check will fail in this scenario.

         db_->RemoveMetadata(kv.first);
         break;
     }
@@ -338,4 +323,16 @@ void FakeModelTypeSyncBridge::ErrorOnNextCall() {
   error_next_ = true;
 }
 
+std::unique_ptr<EntityData> FakeModelTypeSyncBridge::CopyEntityData(
+    const EntityData& old_data) {
+  std::unique_ptr<EntityData> new_data(new EntityData());
+  new_data->id = old_data.id;
+  new_data->client_tag_hash = old_data.client_tag_hash;
+  new_data->non_unique_name = old_data.non_unique_name;
+  new_data->specifics = old_data.specifics;
+  new_data->creation_time = old_data.creation_time;
+  new_data->modification_time = old_data.modification_time;
+  return new_data;
+}
+
 }  // namespace syncer