content: Remove the use of linked_ptr from content_test_suite.cc.

content/test/content_test_suite.cc

 // Copyright (c) 2012 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/test/content_test_suite.h"
 
 #if defined(OS_ANDROID)
 #include <android/native_window.h>
 #include <android/native_window_jni.h>
-#include <map>
 #endif
 
 #include "base/base_paths.h"
 #include "base/logging.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/test/test_content_client_initializer.h"
 #include "gpu/config/gpu_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 10 matching lines @@
 
 #if !defined(OS_IOS)
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "media/base/media.h"
 #include "ui/gl/gl_surface.h"
 #endif
 
 #if defined(OS_ANDROID)
 #include "base/android/jni_android.h"
-#include "base/memory/linked_ptr.h"
+#include "base/containers/scoped_ptr_hash_map.h"
+#include "base/memory/scoped_ptr.h"
 #include "content/common/android/surface_texture_manager.h"
 #include "ui/gl/android/scoped_java_surface.h"
 #include "ui/gl/android/surface_texture.h"
 #endif
 
 namespace content {
 namespace {
 
 class TestInitializationListener : public testing::EmptyTestEventListener {
  public:
@@ skipping 15 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(TestInitializationListener);
 };
 
 #if defined(OS_ANDROID)
 class TestSurfaceTextureManager : public SurfaceTextureManager {
  public:
   // Overridden from SurfaceTextureManager:
   void RegisterSurfaceTexture(int surface_texture_id,
                               int client_id,
                               gfx::SurfaceTexture* surface_texture) override {
-    surfaces_[surface_texture_id] =
-        make_linked_ptr(new gfx::ScopedJavaSurface(surface_texture));
+    surfaces_.add(surface_texture_id,
+                  make_scoped_ptr(new gfx::ScopedJavaSurface(surface_texture)));
   }
   void UnregisterSurfaceTexture(int surface_texture_id,
                                 int client_id) override {
     surfaces_.erase(surface_texture_id);
   }
   gfx::AcceleratedWidget AcquireNativeWidgetForSurfaceTexture(
       int surface_texture_id) override {
     JNIEnv* env = base::android::AttachCurrentThread();
     return ANativeWindow_fromSurface(
-        env, surfaces_[surface_texture_id]->j_surface().obj());
+        env, surfaces_.get(surface_texture_id)->j_surface().obj());
   }
 
  private:
-  typedef std::map<int, linked_ptr<gfx::ScopedJavaSurface>> SurfaceMap;
+  using SurfaceMap =
+      base::ScopedPtrHashMap<int, scoped_ptr<gfx::ScopedJavaSurface>>;
   SurfaceMap surfaces_;
 };
 #endif
 
 }  // namespace
 
 ContentTestSuite::ContentTestSuite(int argc, char** argv)
     : ContentTestSuiteBase(argc, argv) {
 }
 
@@ skipping 30 matching lines @@
 #endif
   testing::TestEventListeners& listeners =
       testing::UnitTest::GetInstance()->listeners();
   listeners.Append(new TestInitializationListener);
 #if defined(OS_ANDROID)
   SurfaceTextureManager::InitInstance(new TestSurfaceTextureManager);
 #endif
 }
 
 }  // namespace content