| Index: content/browser/compositor/test/no_transport_image_transport_factory.h
|
| diff --git a/content/browser/compositor/test/no_transport_image_transport_factory.h b/content/browser/compositor/test/no_transport_image_transport_factory.h
|
| index 52f4ebe00b5fb2ce23cf80968b4e3cd54509a86f..ccfee3797da34775d1799076c78dccea82426f23 100644
|
| --- a/content/browser/compositor/test/no_transport_image_transport_factory.h
|
| +++ b/content/browser/compositor/test/no_transport_image_transport_factory.h
|
| @@ -5,8 +5,9 @@
|
| #ifndef CONTENT_BROWSER_COMPOSITOR_TEST_NO_TRANSPORT_IMAGE_TRANSPORT_FACTORY_H_
|
| #define CONTENT_BROWSER_COMPOSITOR_TEST_NO_TRANSPORT_IMAGE_TRANSPORT_FACTORY_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/observer_list.h"
|
| #include "build/build_config.h"
|
| #include "content/browser/compositor/image_transport_factory.h"
|
| @@ -41,10 +42,10 @@ class NoTransportImageTransportFactory : public ImageTransportFactory {
|
| #endif
|
|
|
| private:
|
| - scoped_ptr<cc::SurfaceManager> surface_manager_;
|
| - scoped_ptr<ui::ContextFactory> context_factory_;
|
| + std::unique_ptr<cc::SurfaceManager> surface_manager_;
|
| + std::unique_ptr<ui::ContextFactory> context_factory_;
|
| scoped_refptr<cc::ContextProvider> context_provider_;
|
| - scoped_ptr<GLHelper> gl_helper_;
|
| + std::unique_ptr<GLHelper> gl_helper_;
|
| base::ObserverList<ImageTransportFactoryObserver> observer_list_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(NoTransportImageTransportFactory);
|
|
|