| Index: components/test_runner/test_plugin.h
 | 
| diff --git a/components/test_runner/test_plugin.h b/components/test_runner/test_plugin.h
 | 
| index 7a96bafd8f437186992e2b2858f7e179e153f08d..6299b153e7d7ea07d71281745a7d3858811171c4 100644
 | 
| --- a/components/test_runner/test_plugin.h
 | 
| +++ b/components/test_runner/test_plugin.h
 | 
| @@ -5,10 +5,10 @@
 | 
|  #ifndef COMPONENTS_TEST_RUNNER_TEST_PLUGIN_H_
 | 
|  #define COMPONENTS_TEST_RUNNER_TEST_PLUGIN_H_
 | 
|  
 | 
| +#include <memory>
 | 
|  #include <string>
 | 
|  
 | 
|  #include "base/macros.h"
 | 
| -#include "base/memory/scoped_ptr.h"
 | 
|  #include "cc/layers/texture_layer.h"
 | 
|  #include "cc/layers/texture_layer_client.h"
 | 
|  #include "third_party/WebKit/public/platform/WebExternalTextureLayer.h"
 | 
| @@ -99,7 +99,7 @@ class TestPlugin : public blink::WebPlugin, public cc::TextureLayerClient {
 | 
|    // cc::TextureLayerClient methods:
 | 
|    bool PrepareTextureMailbox(
 | 
|        cc::TextureMailbox* mailbox,
 | 
| -      scoped_ptr<cc::SingleReleaseCallback>* release_callback,
 | 
| +      std::unique_ptr<cc::SingleReleaseCallback>* release_callback,
 | 
|        bool use_shared_memory) override;
 | 
|  
 | 
|   private:
 | 
| @@ -158,17 +158,17 @@ class TestPlugin : public blink::WebPlugin, public cc::TextureLayerClient {
 | 
|    blink::WebPluginContainer* container_;
 | 
|  
 | 
|    blink::WebRect rect_;
 | 
| -  scoped_ptr<blink::WebGraphicsContext3DProvider> context_provider_;
 | 
| +  std::unique_ptr<blink::WebGraphicsContext3DProvider> context_provider_;
 | 
|    blink::WebGraphicsContext3D* context_;
 | 
|    gpu::gles2::GLES2Interface* gl_;
 | 
|    GLuint color_texture_;
 | 
|    cc::TextureMailbox texture_mailbox_;
 | 
| -  scoped_ptr<cc::SharedBitmap> shared_bitmap_;
 | 
| +  std::unique_ptr<cc::SharedBitmap> shared_bitmap_;
 | 
|    bool mailbox_changed_;
 | 
|    GLuint framebuffer_;
 | 
|    Scene scene_;
 | 
|    scoped_refptr<cc::TextureLayer> layer_;
 | 
| -  scoped_ptr<blink::WebLayer> web_layer_;
 | 
| +  std::unique_ptr<blink::WebLayer> web_layer_;
 | 
|  
 | 
|    blink::WebPluginContainer::TouchEventRequestType touch_event_request_;
 | 
|    // Requests touch events from the WebPluginContainerImpl multiple times to
 | 
| 
 |