Revert "[Sync] Actively guard against provider being cleared in DeviceInfoSyncBridge."

components/sync/device_info/device_info_sync_bridge_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/device_info/device_info_sync_bridge.h"
 
 #include <algorithm>
 #include <set>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "components/sync/base/time.h"
 #include "components/sync/device_info/local_device_info_provider_mock.h"
 #include "components/sync/model/data_batch.h"
 #include "components/sync/model/data_type_error_handler_mock.h"
 #include "components/sync/model/entity_data.h"
 #include "components/sync/model/fake_model_type_change_processor.h"
 #include "components/sync/model/metadata_batch.h"
 #include "components/sync/model/model_type_store_test_util.h"
 #include "components/sync/protocol/model_type_state.pb.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace syncer {
 
-using base::OneShotTimer;
 using base::Time;
 using base::TimeDelta;
 using sync_pb::DeviceInfoSpecifics;
 using sync_pb::EntitySpecifics;
 using sync_pb::ModelTypeState;
 
 using DeviceInfoList = std::vector<std::unique_ptr<DeviceInfo>>;
 using StorageKeyList = ModelTypeSyncBridge::StorageKeyList;
 using RecordList = ModelTypeStore::RecordList;
 using Result = ModelTypeStore::Result;
@@ skipping 216 matching lines @@
   DeviceInfoSyncBridge* bridge() {
     EXPECT_TRUE(bridge_);
     return bridge_.get();
   }
 
   RecordingModelTypeChangeProcessor* processor() {
     EXPECT_TRUE(processor_);
     return processor_;
   }
 
-  const OneShotTimer& pulse_timer() { return bridge()->pulse_timer_; }
-
   // Should only be called after the bridge has been initialized. Will first
   // recover the bridge's store, so another can be initialized later, and then
   // deletes the bridge.
   void PumpAndShutdown() {
     ASSERT_TRUE(bridge_);
     base::RunLoop().RunUntilIdle();
     std::swap(store_, bridge_->store_);
     bridge_->RemoveObserver(this);
     bridge_.reset();
   }
@@ skipping 68 matching lines @@
   local_device()->Initialize(CreateModel(1));
   base::RunLoop().RunUntilIdle();
 
   DeviceInfoList devices = bridge()->GetAllDeviceInfo();
   ASSERT_EQ(1u, devices.size());
   EXPECT_TRUE(local_device()->GetLocalDeviceInfo()->Equals(*devices[0]));
 
   EXPECT_TRUE(processor()->metadata());
 }
 
-// Simulate shutting down sync during the ModelTypeStore callbacks. The pulse
-// timer should still be initialized, even though reconcile never occurs.
-TEST_F(DeviceInfoSyncBridgeTest, ClearProviderDuringInit) {
-  InitializeBridge();
-  local_device()->Clear();
-  base::RunLoop().RunUntilIdle();
-  EXPECT_EQ(0u, bridge()->GetAllDeviceInfo().size());
-  EXPECT_TRUE(pulse_timer().IsRunning());
-}
-
 TEST_F(DeviceInfoSyncBridgeTest, GetClientTagNormal) {
   InitializeBridge();
   const std::string guid = "abc";
   EntitySpecifics entity_specifics;
   entity_specifics.mutable_device_info()->set_cache_guid(guid);
   EntityData entity_data;
   entity_data.specifics = entity_specifics;
   EXPECT_EQ(CacheGuidToTag(guid), bridge()->GetClientTag(entity_data));
 }
 
@@ skipping 195 matching lines @@
 TEST_F(DeviceInfoSyncBridgeTest, ApplyDeleteNonexistent) {
   InitializeAndPump();
   EXPECT_EQ(1, change_count());
   const SyncError error =
       bridge()->ApplySyncChanges(bridge()->CreateMetadataChangeList(),
                                  {EntityChange::CreateDelete("guid")});
   EXPECT_FALSE(error.IsSet());
   EXPECT_EQ(1, change_count());
 }
 
-TEST_F(DeviceInfoSyncBridgeTest, ClearProviderAndApply) {
-  // This will initialize the provider a first time.
-  InitializeAndPump();
-  EXPECT_EQ(1u, bridge()->GetAllDeviceInfo().size());
-
-  const DeviceInfoSpecifics specifics = CreateSpecifics(1, Time::Now());
-
-  local_device()->Clear();
-  SyncError error = bridge()->ApplySyncChanges(
-      bridge()->CreateMetadataChangeList(), EntityAddList({specifics}));
-  EXPECT_FALSE(error.IsSet());
-  EXPECT_EQ(1u, bridge()->GetAllDeviceInfo().size());
-
-  local_device()->Initialize(CreateModel(kDefaultLocalSuffix));
-  error = bridge()->ApplySyncChanges(bridge()->CreateMetadataChangeList(),
-                                     EntityAddList({specifics}));
-  EXPECT_EQ(2u, bridge()->GetAllDeviceInfo().size());
-}
-
 TEST_F(DeviceInfoSyncBridgeTest, MergeEmpty) {
   InitializeAndPump();
   EXPECT_EQ(1, change_count());
   const SyncError error = bridge()->MergeSyncData(
       bridge()->CreateMetadataChangeList(), EntityDataMap());
   EXPECT_FALSE(error.IsSet());
   EXPECT_EQ(1, change_count());
   // TODO(skym): Stop sending local twice. The first of the two puts will
   // probably happen before the processor is tracking metadata yet, and so there
   // should not be much overhead.
@@ skipping 93 matching lines @@
   // loaded, and thus reconcile is never called. The bridge should ignore this
   // EntityData because its cache guid is the same the local device's.
   const SyncError error = bridge()->MergeSyncData(
       bridge()->CreateMetadataChangeList(),
       {{specifics.cache_guid(), SpecificsToEntity(specifics)}});
   EXPECT_FALSE(error.IsSet());
   EXPECT_EQ(0, change_count());
   EXPECT_EQ(0u, bridge()->GetAllDeviceInfo().size());
 }
 
-TEST_F(DeviceInfoSyncBridgeTest, ClearProviderAndMerge) {
-  // This will initialize the provider a first time.
-  InitializeAndPump();
-  EXPECT_EQ(1u, bridge()->GetAllDeviceInfo().size());
-
-  const DeviceInfoSpecifics specifics = CreateSpecifics(1, Time::Now());
-
-  local_device()->Clear();
-  SyncError error = bridge()->MergeSyncData(
-      bridge()->CreateMetadataChangeList(), InlineEntityDataMap({specifics}));
-  EXPECT_FALSE(error.IsSet());
-  EXPECT_EQ(1u, bridge()->GetAllDeviceInfo().size());
-  local_device()->Initialize(CreateModel(kDefaultLocalSuffix));
-  error = bridge()->MergeSyncData(bridge()->CreateMetadataChangeList(),
-                                  InlineEntityDataMap({specifics}));
-  EXPECT_EQ(2u, bridge()->GetAllDeviceInfo().size());
-}
-
 TEST_F(DeviceInfoSyncBridgeTest, CountActiveDevices) {
   InitializeAndPump();
   EXPECT_EQ(1, bridge()->CountActiveDevices());
 
   DeviceInfoSpecifics specifics = CreateSpecifics(0);
   bridge()->ApplySyncChanges(bridge()->CreateMetadataChangeList(),
                              EntityAddList({specifics}));
   EXPECT_EQ(1, bridge()->CountActiveDevices());
 
   specifics.set_last_updated_timestamp(TimeToProtoTime(Time::Now()));
@@ skipping 68 matching lines @@
 
   // Reloading from storage shouldn't contain remote data.
   RestartBridge();
   EXPECT_EQ(1u, bridge()->GetAllDeviceInfo().size());
   EXPECT_EQ(4, change_count());
 }
 
 }  // namespace
 
 }  // namespace syncer