Revert of Remove stl_util's deletion function use from components/invalidation/.

components/invalidation/impl/registration_manager.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.
 //
 // A class that manages the registration of types for server-issued
 // notifications.
 
 #ifndef COMPONENTS_INVALIDATION_IMPL_REGISTRATION_MANAGER_H_
 #define COMPONENTS_INVALIDATION_IMPL_REGISTRATION_MANAGER_H_
 
 #include <map>
-#include <memory>
 
 #include "base/macros.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 // For invalidation::InvalidationListener::RegistrationState.
 #include "components/invalidation/public/invalidation_export.h"
 #include "components/invalidation/public/invalidation_util.h"
 #include "google/cacheinvalidation/include/invalidation-listener.h"
 #include "google/cacheinvalidation/include/types.h"
@@ skipping 118 matching lines @@
     // negative).
     base::TimeDelta delay;
     // The minimum time to wait until any next registration attempt.
     // Increased after each consecutive failure.
     base::TimeDelta next_delay;
     // The actual timer for registration.
     base::OneShotTimer registration_timer;
 
     DISALLOW_COPY_AND_ASSIGN(RegistrationStatus);
   };
+  typedef std::map<invalidation::ObjectId,
+                   RegistrationStatus*,
+                   ObjectIdLessThan>
+      RegistrationStatusMap;
 
   // Does nothing if the given id is disabled.  Otherwise, if
   // |is_retry| is not set, registers the given type immediately and
   // resets all backoff parameters.  If |is_retry| is set, registers
   // the given type at some point in the future and increases the
   // delay until the next retry.
   void TryRegisterId(const invalidation::ObjectId& id,
                      bool is_retry);
 
   // Registers the given id, which must be valid, immediately.
   // Updates |last_registration| in the appropriate
   // RegistrationStatus.  Should only be called by
   // RegistrationStatus::DoRegister().
   void DoRegisterId(const invalidation::ObjectId& id);
 
   // Unregisters the given object ID.
   void UnregisterId(const invalidation::ObjectId& id);
 
   // Gets all currently registered ids.
   ObjectIdSet GetRegisteredIds() const;
 
   // Returns true iff the given object ID is registered.
   bool IsIdRegistered(const invalidation::ObjectId& id) const;
 
-  std::map<invalidation::ObjectId,
-           std::unique_ptr<RegistrationStatus>,
-           ObjectIdLessThan>
-      registration_statuses_;
+  RegistrationStatusMap registration_statuses_;
   // Weak pointer.
   invalidation::InvalidationClient* invalidation_client_;
 
   DISALLOW_COPY_AND_ASSIGN(RegistrationManager);
 };
 
 }  // namespace syncer
 
 #endif  // COMPONENTS_INVALIDATION_IMPL_REGISTRATION_MANAGER_H_