Part 2 of base::IDMap refactor to eliminate IDMapOwnPointer/IDMapExternalPointer modes

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

 // Copyright 2015 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.
 
 #ifndef CHROME_BROWSER_MEDIA_ANDROID_ROUTER_MEDIA_ROUTER_ANDROID_H_
 #define CHROME_BROWSER_MEDIA_ANDROID_ROUTER_MEDIA_ROUTER_ANDROID_H_
 
 #include <jni.h>
 #include <stdint.h>
 
@@ skipping 142 matching lines @@
         const MediaSource& source,
         const std::string& presentation_id,
         const std::vector<MediaRouteResponseCallback>& callbacks);
     ~MediaRouteRequest();
 
     MediaSource media_source;
     std::string presentation_id;
     std::vector<MediaRouteResponseCallback> callbacks;
   };
 
-  using MediaRouteRequests =
-      IDMap<MediaRouteRequest, IDMapOwnPointer>;
+  using MediaRouteRequests = IDMap<std::unique_ptr<MediaRouteRequest>>;
   MediaRouteRequests route_requests_;
 
   using MediaRoutes = std::vector<MediaRoute>;
   MediaRoutes active_routes_;
 
-  using SendMessageCallbacks = IDMap<SendRouteMessageCallback, IDMapOwnPointer>;
+  using SendMessageCallbacks = IDMap<std::unique_ptr<SendRouteMessageCallback>>;
   SendMessageCallbacks message_callbacks_;
 
   using MessageObservers = base::ScopedPtrHashMap<
     MediaRoute::Id, std::unique_ptr<base::ObserverList<RouteMessageObserver>>>;
   MessageObservers message_observers_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaRouterAndroid);
 };
 
 } // namespace media_router
 
 #endif  // CHROME_BROWSER_MEDIA_ANDROID_ROUTER_MEDIA_ROUTER_ANDROID_H_