[USS] Store supports hosting multiple datatypes per database

components/sync_driver/device_info_service_unittest.cc

 // Copyright 2015 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 "components/sync_driver/device_info_service.h"
 
 #include <map>
 #include <memory>
 #include <set>
 #include <string>
@@ skipping 151 matching lines @@
   std::unique_ptr<MetadataBatch> metadata_;
 };
 
 }  // namespace
 
 class DeviceInfoServiceTest : public testing::Test,
                               public DeviceInfoTracker::Observer {
  protected:
   DeviceInfoServiceTest()
       : change_count_(0),
-        store_(ModelTypeStoreTestUtil::CreateInMemoryStoreForTest()),
         local_device_(new LocalDeviceInfoProviderMock()) {
     local_device_->Initialize(CreateDeviceInfo());
   }
 
   ~DeviceInfoServiceTest() override {
     // Some tests may never initialize the service.
     if (service_)
       service_->RemoveObserver(this);
 
     // Force all remaining (store) tasks to execute so we don't leak memory.
     base::RunLoop().RunUntilIdle();
   }
 
+  void SetUp() override {

[maxbogue, 2016/06/23 18:22:22]

I believe this should just be in the body of the constructor, and likewise with
TearDown in the destructor.

[Gang Wu, 2016/06/27 23:19:39]

Done.

+    store_ = ModelTypeStoreTestUtil::CreateInMemoryStoreForTest();
+    base::RunLoop().RunUntilIdle();
+  }
+
+  void TearDown() override {
+    std::swap(store_, service_->store_);
+    store_.reset();
+    base::RunLoop().RunUntilIdle();
+  }
+
   void OnDeviceInfoChange() override { change_count_++; }
 
   std::unique_ptr<ModelTypeChangeProcessor> CreateModelTypeChangeProcessor(
       syncer::ModelType type,
       ModelTypeService* service) {
     processor_ = new RecordingModelTypeChangeProcessor();
     return base::WrapUnique(processor_);
   }
 
   // Initialized the service based on the current local device and store. Can
@@ skipping 531 matching lines @@
   const SyncError error = service()->MergeSyncData(
       service()->CreateMetadataChangeList(), remote_input);
   EXPECT_FALSE(error.IsSet());
   EXPECT_EQ(0, change_count());
   EXPECT_EQ(1u, service()->GetAllDeviceInfo().size());
   EXPECT_TRUE(processor()->delete_set().empty());
   EXPECT_TRUE(processor()->put_map().empty());
 }
 
 TEST_F(DeviceInfoServiceTest, GetLastUpdateTime) {
+  InitializeAndPump();
   Time time1(Time() + TimeDelta::FromDays(1));
 
   DeviceInfoSpecifics specifics1(GenerateTestSpecifics());
   DeviceInfoSpecifics specifics2(GenerateTestSpecifics());
   specifics2.set_last_updated_timestamp(syncer::TimeToProtoTime(time1));
 
   EXPECT_EQ(Time(), GetLastUpdateTime(specifics1));
   EXPECT_EQ(time1, GetLastUpdateTime(specifics2));
 }
 
@@ skipping 20 matching lines @@
   specifics.set_cache_guid("non-local");
   PushBackEntityChangeAdd(specifics, &change_list);
   service()->ApplySyncChanges(service()->CreateMetadataChangeList(),
                               change_list);
   EXPECT_EQ(1, service()->CountActiveDevices());
 }
 
 }  // namespace
 
 }  // namespace sync_driver_v2