Remove stl_util's STLValueDeleter.

components/sync/engine_impl/get_updates_processor_unittest.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 "components/sync/engine_impl/get_updates_processor.h"
 
 #include <stdint.h>
 
+#include <set>
 #include <string>
 
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
-#include "base/stl_util.h"
 #include "components/sync/base/model_type_test_util.h"
 #include "components/sync/engine_impl/cycle/debug_info_getter.h"
 #include "components/sync/engine_impl/cycle/mock_debug_info_getter.h"
 #include "components/sync/engine_impl/cycle/nudge_tracker.h"
 #include "components/sync/engine_impl/cycle/status_controller.h"
 #include "components/sync/engine_impl/get_updates_delegate.h"
 #include "components/sync/engine_impl/update_handler.h"
 #include "components/sync/protocol/sync.pb.h"
 #include "components/sync/test/engine/fake_model_worker.h"
 #include "components/sync/test/engine/mock_update_handler.h"
 #include "components/sync/test/mock_invalidation.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace syncer {
 
 namespace {
 
 std::unique_ptr<InvalidationInterface> BuildInvalidation(
     int64_t version,
     const std::string& payload) {
   return MockInvalidation::Build(version, payload);
 }
 
 }  // namespace
 
 // A test fixture for tests exercising download updates functions.
 class GetUpdatesProcessorTest : public ::testing::Test {
  protected:
-  GetUpdatesProcessorTest()
-      : kTestStartTime(base::TimeTicks::Now()),
-        update_handler_deleter_(&update_handler_map_) {}
+  GetUpdatesProcessorTest() : kTestStartTime(base::TimeTicks::Now()) {}
 
   void SetUp() override {
     AddUpdateHandler(AUTOFILL);
     AddUpdateHandler(BOOKMARKS);
     AddUpdateHandler(PREFERENCES);
   }
 
   ModelTypeSet enabled_types() { return enabled_types_; }
 
   std::unique_ptr<GetUpdatesProcessor> BuildGetUpdatesProcessor(
@@ skipping 18 matching lines @@
 
     response->set_changes_remaining(0);
   }
 
   const base::TimeTicks kTestStartTime;
 
  protected:
   MockUpdateHandler* AddUpdateHandler(ModelType type) {
     enabled_types_.Put(type);
 
-    MockUpdateHandler* handler = new MockUpdateHandler(type);
-    update_handler_map_.insert(std::make_pair(type, handler));
+    std::unique_ptr<MockUpdateHandler> handler =
+        base::MakeUnique<MockUpdateHandler>(type);
+    MockUpdateHandler* handler_ptr = handler.get();
 
-    return handler;
+    update_handler_map_.insert(std::make_pair(type, handler_ptr));
+    update_handlers_.insert(std::move(handler));
+    return handler_ptr;
   }
 
  private:
   ModelTypeSet enabled_types_;
+  std::set<std::unique_ptr<MockUpdateHandler>> update_handlers_;
   UpdateHandlerMap update_handler_map_;
-  base::STLValueDeleter<UpdateHandlerMap> update_handler_deleter_;
   std::unique_ptr<GetUpdatesProcessor> get_updates_processor_;
 
   DISALLOW_COPY_AND_ASSIGN(GetUpdatesProcessorTest);
 };
 
 // Basic test to make sure nudges are expressed properly in the request.
 TEST_F(GetUpdatesProcessorTest, BookmarkNudge) {
   NudgeTracker nudge_tracker;
   nudge_tracker.RecordLocalChange(ModelTypeSet(BOOKMARKS));
 
@@ skipping 386 matching lines @@
 TEST_F(DownloadUpdatesDebugInfoTest, VerifyCopyOverwrites) {
   sync_pb::DebugInfo debug_info;
   AddDebugEvent();
   GetUpdatesProcessor::CopyClientDebugInfo(debug_info_getter(), &debug_info);
   EXPECT_EQ(1, debug_info.events_size());
   GetUpdatesProcessor::CopyClientDebugInfo(debug_info_getter(), &debug_info);
   EXPECT_EQ(1, debug_info.events_size());
 }
 
 }  // namespace syncer