Update from https://crrev.com/328418

cc/surfaces/surface_aggregator.h

 // Copyright 2014 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 CC_SURFACES_SURFACE_AGGREGATOR_H_
 #define CC_SURFACES_SURFACE_AGGREGATOR_H_
 
 #include <set>
 
 #include "base/containers/hash_tables.h"
@@ skipping 68 matching lines @@
                      RenderPassList* render_pass_list);
   int ChildIdForSurface(Surface* surface);
   gfx::Rect DamageRectForSurface(const Surface* surface,
                                  const RenderPass& source,
                                  const gfx::Rect& full_rect);
 
   SurfaceManager* manager_;
   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_;
 
   typedef base::hash_map<SurfaceId, int> SurfaceToResourceChildIdMap;
   SurfaceToResourceChildIdMap surface_id_to_resource_child_id_;
 
   // The following state is only valid for the duration of one Aggregate call
   // and is only stored on the class to avoid having to pass through every
   // function call.
@@ skipping 13 matching lines @@
 
   // Resource list for the aggregated frame.
   TransferableResourceArray* dest_resource_list_;
 
   DISALLOW_COPY_AND_ASSIGN(SurfaceAggregator);
 };
 
 }  // namespace cc
 
 #endif  // CC_SURFACES_SURFACE_AGGREGATOR_H_