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

components/invalidation/impl/registration_manager.h

Index: components/invalidation/impl/registration_manager.h
diff --git a/components/invalidation/impl/registration_manager.h b/components/invalidation/impl/registration_manager.h
index d608bd8c142a56ed17970fcf48cc59d9e6b76138..23fc9a6db380a6c1f77aecd7088a03d22a69c184 100644
--- a/components/invalidation/impl/registration_manager.h
+++ b/components/invalidation/impl/registration_manager.h
@@ -9,7 +9,6 @@
 #define COMPONENTS_INVALIDATION_IMPL_REGISTRATION_MANAGER_H_
 
 #include <map>
-#include <memory>
 
 #include "base/macros.h"
 #include "base/threading/non_thread_safe.h"
@@ -148,6 +147,10 @@
 
     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
@@ -172,10 +175,7 @@
   // 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_;