Remove base::ScopedPtrHashMap from content/ android.

content/browser/media/android/media_web_contents_observer_android.cc

 // Copyright 2016 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.
 
 #include "content/browser/media/android/media_web_contents_observer_android.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "content/browser/media/android/browser_media_player_manager.h"
@@ skipping 27 matching lines @@
   return static_cast<MediaWebContentsObserverAndroid*>(
       static_cast<WebContentsImpl*>(web_contents)
           ->media_web_contents_observer());
 }
 
 BrowserMediaPlayerManager*
 MediaWebContentsObserverAndroid::GetMediaPlayerManager(
     RenderFrameHost* render_frame_host) {
   auto it = media_player_managers_.find(render_frame_host);
   if (it != media_player_managers_.end())
-    return it->second;
+    return it->second.get();
 
   BrowserMediaPlayerManager* manager =
       BrowserMediaPlayerManager::Create(render_frame_host);
-  media_player_managers_.set(render_frame_host, base::WrapUnique(manager));
+  media_player_managers_[render_frame_host] = base::WrapUnique(manager);
   return manager;
 }
 
 BrowserSurfaceViewManager*
 MediaWebContentsObserverAndroid::GetSurfaceViewManager(
     RenderFrameHost* render_frame_host) {
   auto it = surface_view_managers_.find(render_frame_host);
   if (it != surface_view_managers_.end())
-    return it->second;
+    return it->second.get();
 
   BrowserSurfaceViewManager* manager =
       new BrowserSurfaceViewManager(render_frame_host);
-  surface_view_managers_.set(render_frame_host, base::WrapUnique(manager));
+  surface_view_managers_[render_frame_host] = base::WrapUnique(manager);
   return manager;
 }
 
 void MediaWebContentsObserverAndroid::SuspendAllMediaPlayers() {
   web_contents()->ForEachFrame(
       base::Bind(&SuspendAllMediaPlayersInRenderFrame));
 }
 
 bool MediaWebContentsObserverAndroid::RequestPlay(
     RenderFrameHost* render_frame_host,
@@ skipping 93 matching lines @@
                         BrowserSurfaceViewManager::OnCreateFullscreenSurface)
     IPC_MESSAGE_FORWARD(SurfaceViewManagerHostMsg_NaturalSizeChanged,
                         GetSurfaceViewManager(render_frame_host),
                         BrowserSurfaceViewManager::OnNaturalSizeChanged)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 }  // namespace content