[Sync] Add support for immediately enabling wallet datatype

sync/test/fake_server/unique_client_entity.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sync/test/fake_server/unique_client_entity.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/guid.h"
@@ skipping 56 matching lines @@
                                 client_entity.ctime(),
                                 client_entity.mtime());
 }
 
 // static
 scoped_ptr<FakeServerEntity> UniqueClientEntity::CreateForInjection(
     ModelType model_type,
     const string& name,
     const sync_pb::EntitySpecifics& entity_specifics) {
   string client_defined_unique_tag = GenerateSyncableHash(model_type, name);
-  string id = FakeServerEntity::CreateId(model_type, base::GenerateGUID());
+  string id = FakeServerEntity::CreateId(model_type, client_defined_unique_tag);
   return scoped_ptr<FakeServerEntity>(
       new UniqueClientEntity(id,
                              model_type,
                              kUnusedVersion,
                              name,
                              client_defined_unique_tag,
                              entity_specifics,
                              kDefaultTime,
                              kDefaultTime));
 }
@@ skipping 26 matching lines @@
 
 bool UniqueClientEntity::IsDeleted() const {
   return false;
 }
 
 bool UniqueClientEntity::IsFolder() const {
   return false;
 }
 
 }  // namespace fake_server