Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(387)

Unified Diff: content/browser/compositor/test/no_transport_image_transport_factory.h

Issue 1874893002: Convert //content/browser from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);
« no previous file with comments | « content/browser/compositor/surface_utils.cc ('k') | content/browser/compositor/test/no_transport_image_transport_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698