Reland of move stl_util's deletion function use from components/invalidation/.

components/invalidation/impl/sync_system_resources.h

 // 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.
 //
 // Simple system resources class that uses the current thread for scheduling.
 // Assumes the current thread is already running tasks.
 
 #ifndef COMPONENTS_INVALIDATION_IMPL_SYNC_SYSTEM_RESOURCES_H_
 #define COMPONENTS_INVALIDATION_IMPL_SYNC_SYSTEM_RESOURCES_H_
 
@@ skipping 52 matching lines @@
 
   invalidation::Time GetCurrentTime() const override;
 
   void SetSystemResources(invalidation::SystemResources* resources) override;
 
  private:
   // Runs the task, deletes it, and removes it from |posted_tasks_|.
   void RunPostedTask(invalidation::Closure* task);
 
   // Holds all posted tasks that have not yet been run.
-  std::set<invalidation::Closure*> posted_tasks_;
+  std::set<std::unique_ptr<invalidation::Closure>> posted_tasks_;
 
   scoped_refptr<base::SingleThreadTaskRunner> const created_on_task_runner_;
   bool is_started_;
   bool is_stopped_;
 
   base::WeakPtrFactory<SyncInvalidationScheduler> weak_factory_;
 };
 
 // SyncNetworkChannel implements common tasks needed to interact with
 // invalidation library:
@@ skipping 68 matching lines @@
   // NotifyChannelStateChange. If communication doesn't work and it is possible
   // that invalidations from server will not reach this client then channel
   // should call this function with TRANSIENT_INVALIDATION_ERROR.
   void NotifyChannelStateChange(InvalidatorState invalidator_state);
 
   // Subclass should call DeliverIncomingMessage for message to reach
   // invalidations library.
   bool DeliverIncomingMessage(const std::string& message);
 
  private:
-  typedef std::vector<invalidation::NetworkStatusCallback*>
-      NetworkStatusReceiverList;
-
   // Callbacks into invalidation library
   std::unique_ptr<invalidation::MessageCallback> incoming_receiver_;
-  NetworkStatusReceiverList network_status_receivers_;
+  std::vector<std::unique_ptr<invalidation::NetworkStatusCallback>>
+      network_status_receivers_;
 
   // Last network status for new network status receivers.
   bool last_network_status_;
 
   int received_messages_count_;
 
   base::ObserverList<Observer> observers_;
 };
 
 class SyncStorage : public invalidation::Storage {
@@ skipping 62 matching lines @@
   std::unique_ptr<SyncInvalidationScheduler> internal_scheduler_;
   std::unique_ptr<SyncInvalidationScheduler> listener_scheduler_;
   std::unique_ptr<SyncStorage> storage_;
   // sync_network_channel_ is owned by SyncInvalidationListener.
   SyncNetworkChannel* sync_network_channel_;
 };
 
 }  // namespace syncer
 
 #endif  // COMPONENTS_INVALIDATION_IMPL_SYNC_SYSTEM_RESOURCES_H_