Convert //base to use std::unique_ptr
With bonus IWYU fixes that weren't caught by local android gn, cros gn,
linux gn, mac gyp, and win gyp builds.
BUG=554298
[email protected]
Review URL: https://codereview.chromium.org/1852433005
Cr-Commit-Position: refs/heads/master@{#385011}
diff --git a/base/callback_list_unittest.nc b/base/callback_list_unittest.nc
index ef193f4..0ddc135 100644
--- a/base/callback_list_unittest.nc
+++ b/base/callback_list_unittest.nc
@@ -7,12 +7,12 @@
#include "base/callback_list.h"
+#include <memory>
#include <utility>
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
namespace base {
@@ -26,9 +26,9 @@
public:
FooListener() {}
- void GotAScopedFoo(scoped_ptr<Foo> f) { foo_ = std::move(f); }
+ void GotAScopedFoo(std::unique_ptr<Foo> f) { foo_ = std::move(f); }
- scoped_ptr<Foo> foo_;
+ std::unique_ptr<Foo> foo_;
private:
DISALLOW_COPY_AND_ASSIGN(FooListener);
@@ -45,10 +45,10 @@
// first callback has been run.
void WontCompile() {
FooListener f;
- CallbackList<void(scoped_ptr<Foo>)> c1;
- scoped_ptr<CallbackList<void(scoped_ptr<Foo>)>::Subscription> sub =
+ CallbackList<void(std::unique_ptr<Foo>)> c1;
+ std::unique_ptr<CallbackList<void(std::unique_ptr<Foo>)>::Subscription> sub =
c1.Add(Bind(&FooListener::GotAScopedFoo, Unretained(&f)));
- c1.Notify(scoped_ptr<Foo>(new Foo()));
+ c1.Notify(std::unique_ptr<Foo>(new Foo()));
}
#endif
