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

Unified Diff: base/memory/scoped_vector_unittest.cc

Issue 1852433005: Convert //base to use std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase after r384946 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
« no previous file with comments | « base/memory/scoped_vector.h ('k') | base/memory/shared_memory_mac_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/memory/scoped_vector_unittest.cc
diff --git a/base/memory/scoped_vector_unittest.cc b/base/memory/scoped_vector_unittest.cc
index 8638ecee55ee447ecf96f52f58f7188c265cf7c3..ea3dcdc4858f225ef1d4fb9ceb0e4a6fc5048ef7 100644
--- a/base/memory/scoped_vector_unittest.cc
+++ b/base/memory/scoped_vector_unittest.cc
@@ -4,12 +4,12 @@
#include "base/memory/scoped_vector.h"
+#include <memory>
#include <utility>
#include "base/bind.h"
#include "base/callback.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace {
@@ -112,7 +112,7 @@ class LifeCycleWatcher : public LifeCycleObject::Observer {
private:
LifeCycleState life_cycle_state_;
- scoped_ptr<LifeCycleObject> constructed_life_cycle_object_;
+ std::unique_ptr<LifeCycleObject> constructed_life_cycle_object_;
DISALLOW_COPY_AND_ASSIGN(LifeCycleWatcher);
};
@@ -325,7 +325,7 @@ TEST(ScopedVectorTest, InsertRange) {
// Assertions for push_back(scoped_ptr).
TEST(ScopedVectorTest, PushBackScopedPtr) {
int delete_counter = 0;
- scoped_ptr<DeleteCounter> elem(new DeleteCounter(&delete_counter));
+ std::unique_ptr<DeleteCounter> elem(new DeleteCounter(&delete_counter));
EXPECT_EQ(0, delete_counter);
{
ScopedVector<DeleteCounter> v;
« no previous file with comments | « base/memory/scoped_vector.h ('k') | base/memory/shared_memory_mac_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698