Mandate unique_ptr for base::IDMap in IDMapOwnPointer mode.

chrome/browser/media/android/router/media_router_android.cc

Index: chrome/browser/media/android/router/media_router_android.cc
diff --git a/chrome/browser/media/android/router/media_router_android.cc b/chrome/browser/media/android/router/media_router_android.cc
index f7d5a119250d8de98367c24022c1a4b35abf8680..f01d86cb70016bafff0cb4bf289e1ad1e40d392b 100644
--- a/chrome/browser/media/android/router/media_router_android.cc
+++ b/chrome/browser/media/android/router/media_router_android.cc
@@ -105,7 +105,8 @@ void MediaRouterAndroid::CreateRoute(
       MediaSource(source_id),
       presentation_id,
       callbacks);
-  int route_request_id = route_requests_.Add(request);
+  int route_request_id = route_requests_.Add(
+      std::unique_ptr<MediaRouteRequest>(request));
 
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> jsource_id =
@@ -159,11 +160,10 @@ void MediaRouterAndroid::JoinRoute(
   DVLOG(2) << "JoinRoute: " << source_id << ", " << presentation_id << ", "
            << origin.spec() << ", " << tab_id;
 
-  MediaRouteRequest* request = new MediaRouteRequest(
+  int request_id = route_requests_.Add(base::MakeUnique<MediaRouteRequest>(
       MediaSource(source_id),
       presentation_id,
-      callbacks);
-  int request_id = route_requests_.Add(request);
+      callbacks));
 
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> jsource_id =
@@ -190,7 +190,7 @@ void MediaRouterAndroid::SendRouteMessage(
     const std::string& message,
     const SendRouteMessageCallback& callback) {
   int callback_id = message_callbacks_.Add(
-      new SendRouteMessageCallback(callback));
+      base::MakeUnique<SendRouteMessageCallback>(callback));
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> jroute_id =
           base::android::ConvertUTF8ToJavaString(env, route_id);
@@ -205,7 +205,8 @@ void MediaRouterAndroid::SendRouteBinaryMessage(
     std::unique_ptr<std::vector<uint8_t>> data,
     const SendRouteMessageCallback& callback) {
   int callback_id =
-      message_callbacks_.Add(new SendRouteMessageCallback(callback));
+      message_callbacks_.Add(
+          base::MakeUnique<SendRouteMessageCallback>(callback));
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> jroute_id =
       base::android::ConvertUTF8ToJavaString(env, route_id);