Change ScopedPtrHashMap's 2nd template parameter

Now ScopedPtrHashMap expect the 2nd parameter is scoped_ptr<T>. For example, old usage
ScopedPtrHashMap<int, Value>
new usage
ScopedPtrHashMap<int, scoped_ptr<Value>>

With this change, ScopedPtrHashMap support scoped_ptr's custom deleter.

R=danakj@chromium.org, tzik@chromium.org
BUG=none

Review URL: https://codereview.chromium.org/1099383002

Cr-Commit-Position: refs/heads/master@{#327341}

8 files changed, 20 insertions, 16 deletions

diff --git a/cc/output/direct_renderer.cc b/cc/output/direct_renderer.cc
index 81bd7c1..e1c95e2 100644
--- a/cc/output/direct_renderer.cc
+++ b/cc/output/direct_renderer.cc
@@ -153,11 +153,8 @@ void DirectRenderer::DecideRenderPassAllocationsForFrame(
         RenderPassTextureSize(render_passes_in_draw_order[i])));
 
   std::vector<RenderPassId> passes_to_delete;
-  base::ScopedPtrHashMap<RenderPassId, ScopedResource>::const_iterator
-      pass_iter;
-  for (pass_iter = render_pass_textures_.begin();
-       pass_iter != render_pass_textures_.end();
-       ++pass_iter) {
+  for (auto pass_iter = render_pass_textures_.begin();
+       pass_iter != render_pass_textures_.end(); ++pass_iter) {
     base::hash_map<RenderPassId, gfx::Size>::const_iterator it =
         render_passes_in_frame.find(pass_iter->first);
     if (it == render_passes_in_frame.end()) {
diff --git a/cc/output/direct_renderer.h b/cc/output/direct_renderer.h
index cad7755..34dccd5 100644
--- a/cc/output/direct_renderer.h
+++ b/cc/output/direct_renderer.h
@@ -139,7 +139,8 @@ class CC_EXPORT DirectRenderer : public Renderer {
       DrawingFrame* frame,
       scoped_ptr<CopyOutputRequest> request) = 0;
 
-  base::ScopedPtrHashMap<RenderPassId, ScopedResource> render_pass_textures_;
+  base::ScopedPtrHashMap<RenderPassId, scoped_ptr<ScopedResource>>
+      render_pass_textures_;
   OutputSurface* output_surface_;
   ResourceProvider* resource_provider_;
   scoped_ptr<OverlayProcessor> overlay_processor_;
diff --git a/cc/resources/layer_tiling_data.h b/cc/resources/layer_tiling_data.h
index 5168118..526da6f 100644
--- a/cc/resources/layer_tiling_data.h
+++ b/cc/resources/layer_tiling_data.h
@@ -69,7 +69,7 @@ class CC_EXPORT LayerTilingData {
     DISALLOW_COPY_AND_ASSIGN(Tile);
   };
   typedef std::pair<int, int> TileMapKey;
-  typedef base::ScopedPtrHashMap<TileMapKey, Tile> TileMap;
+  typedef base::ScopedPtrHashMap<TileMapKey, scoped_ptr<Tile>> TileMap;
 
   void AddTile(scoped_ptr<Tile> tile, int i, int j);
   scoped_ptr<Tile> TakeTile(int i, int j);
diff --git a/cc/surfaces/surface_aggregator.h b/cc/surfaces/surface_aggregator.h
index ad99be1..d229e7e 100644
--- a/cc/surfaces/surface_aggregator.h
+++ b/cc/surfaces/surface_aggregator.h
@@ -88,7 +88,7 @@ class CC_SURFACES_EXPORT SurfaceAggregator {
   ResourceProvider* provider_;
 
   class RenderPassIdAllocator;
-  typedef base::ScopedPtrHashMap<SurfaceId, RenderPassIdAllocator>
+  typedef base::ScopedPtrHashMap<SurfaceId, scoped_ptr<RenderPassIdAllocator>>
       RenderPassIdAllocatorMap;
   RenderPassIdAllocatorMap render_pass_allocator_map_;
   int next_render_pass_id_;
diff --git a/cc/surfaces/surface_factory.h b/cc/surfaces/surface_factory.h
index c83fa32..0e812de 100644
--- a/cc/surfaces/surface_factory.h
+++ b/cc/surfaces/surface_factory.h
@@ -76,8 +76,9 @@ class CC_SURFACES_EXPORT SurfaceFactory
 
   bool needs_sync_points_;
 
-  typedef base::ScopedPtrHashMap<SurfaceId, Surface> OwningSurfaceMap;
-  base::ScopedPtrHashMap<SurfaceId, Surface> surface_map_;
+  typedef base::ScopedPtrHashMap<SurfaceId, scoped_ptr<Surface>>
+      OwningSurfaceMap;
+  OwningSurfaceMap surface_map_;
 
   DISALLOW_COPY_AND_ASSIGN(SurfaceFactory);
 };
diff --git a/cc/test/test_web_graphics_context_3d.cc b/cc/test/test_web_graphics_context_3d.cc
index 6d8ccf7..6c139d1 100644
--- a/cc/test/test_web_graphics_context_3d.cc
+++ b/cc/test/test_web_graphics_context_3d.cc
@@ -519,7 +519,8 @@ void TestWebGraphicsContext3D::bindBuffer(GLenum target,
   DCHECK_LT(buffer_id, namespace_->next_buffer_id);
   DCHECK_EQ(context_id, context_id_);
 
-  base::ScopedPtrHashMap<unsigned, Buffer>& buffers = namespace_->buffers;
+  base::ScopedPtrHashMap<unsigned, scoped_ptr<Buffer>>& buffers =
+      namespace_->buffers;
   if (buffers.count(bound_buffer_) == 0)
     buffers.set(bound_buffer_, make_scoped_ptr(new Buffer).Pass());
 
@@ -531,7 +532,8 @@ void TestWebGraphicsContext3D::bufferData(GLenum target,
                                           const void* data,
                                           GLenum usage) {
   base::AutoLock lock(namespace_->lock);
-  base::ScopedPtrHashMap<unsigned, Buffer>& buffers = namespace_->buffers;
+  base::ScopedPtrHashMap<unsigned, scoped_ptr<Buffer>>& buffers =
+      namespace_->buffers;
   DCHECK_GT(buffers.count(bound_buffer_), 0u);
   DCHECK_EQ(target, buffers.get(bound_buffer_)->target);
   Buffer* buffer = buffers.get(bound_buffer_);
@@ -578,7 +580,8 @@ void TestWebGraphicsContext3D::pixelStorei(GLenum pname, GLint param) {
 void* TestWebGraphicsContext3D::mapBufferCHROMIUM(GLenum target,
                                                   GLenum access) {
   base::AutoLock lock(namespace_->lock);
-  base::ScopedPtrHashMap<unsigned, Buffer>& buffers = namespace_->buffers;
+  base::ScopedPtrHashMap<unsigned, scoped_ptr<Buffer>>& buffers =
+      namespace_->buffers;
   DCHECK_GT(buffers.count(bound_buffer_), 0u);
   DCHECK_EQ(target, buffers.get(bound_buffer_)->target);
   if (times_map_buffer_chromium_succeeds_ >= 0) {
@@ -594,7 +597,8 @@ void* TestWebGraphicsContext3D::mapBufferCHROMIUM(GLenum target,
 GLboolean TestWebGraphicsContext3D::unmapBufferCHROMIUM(
     GLenum target) {
   base::AutoLock lock(namespace_->lock);
-  base::ScopedPtrHashMap<unsigned, Buffer>& buffers = namespace_->buffers;
+  base::ScopedPtrHashMap<unsigned, scoped_ptr<Buffer>>& buffers =
+      namespace_->buffers;
   DCHECK_GT(buffers.count(bound_buffer_), 0u);
   DCHECK_EQ(target, buffers.get(bound_buffer_)->target);
   buffers.get(bound_buffer_)->pixels = nullptr;
diff --git a/cc/test/test_web_graphics_context_3d.h b/cc/test/test_web_graphics_context_3d.h
index d8219f5..7ae741e 100644
--- a/cc/test/test_web_graphics_context_3d.h
+++ b/cc/test/test_web_graphics_context_3d.h
@@ -425,7 +425,7 @@ class TestWebGraphicsContext3D {
     unsigned next_image_id;
     unsigned next_texture_id;
     unsigned next_renderbuffer_id;
-    base::ScopedPtrHashMap<unsigned, Buffer> buffers;
+    base::ScopedPtrHashMap<unsigned, scoped_ptr<Buffer>> buffers;
     base::hash_set<unsigned> images;
     OrderedTextureMap textures;
     base::hash_set<unsigned> renderbuffer_set;
diff --git a/cc/trees/tree_synchronizer.cc b/cc/trees/tree_synchronizer.cc
index 095195f..8fe2307 100644
--- a/cc/trees/tree_synchronizer.cc
+++ b/cc/trees/tree_synchronizer.cc
@@ -19,7 +19,8 @@
 
 namespace cc {
 
-typedef base::ScopedPtrHashMap<int, LayerImpl> ScopedPtrLayerImplMap;
+typedef base::ScopedPtrHashMap<int, scoped_ptr<LayerImpl>>
+    ScopedPtrLayerImplMap;
 typedef base::hash_map<int, LayerImpl*> RawPtrLayerImplMap;
 
 void CollectExistingLayerImplRecursive(ScopedPtrLayerImplMap* old_layers,