Update from https://crrev.com/328418

cc/output/direct_renderer.h

 // Copyright 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.
 
 #ifndef CC_OUTPUT_DIRECT_RENDERER_H_
 #define CC_OUTPUT_DIRECT_RENDERER_H_
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/containers/scoped_ptr_hash_map.h"
@@ skipping 120 matching lines @@
   virtual bool FlippedFramebuffer(const DrawingFrame* frame) const = 0;
   virtual void EnsureScissorTestEnabled() = 0;
   virtual void EnsureScissorTestDisabled() = 0;
   virtual void DiscardBackbuffer() {}
   virtual void EnsureBackbuffer() {}
 
   virtual void CopyCurrentRenderPassToBitmap(
       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_;
 
   // For use in coordinate conversion, this stores the output rect, viewport
   // rect (= unflipped version of glViewport rect), and the size of target
   // framebuffer. During a draw, this stores the values for the current render
   // pass; in between draws, they retain the values for the root render pass of
   // the last draw.
   gfx::Rect current_draw_rect_;
   gfx::Rect current_viewport_rect_;
   gfx::Size current_surface_size_;
 
  private:
   gfx::Vector2d enlarge_pass_texture_amount_;
 
   DISALLOW_COPY_AND_ASSIGN(DirectRenderer);
 };
 
 }  // namespace cc
 
 #endif  // CC_OUTPUT_DIRECT_RENDERER_H_