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

Unified Diff: components/mus/public/cpp/tests/window_server_shelltest_base.cc

Issue 1906623003: Convert //components/mus 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: components/mus/public/cpp/tests/window_server_shelltest_base.cc
diff --git a/components/mus/public/cpp/tests/window_server_shelltest_base.cc b/components/mus/public/cpp/tests/window_server_shelltest_base.cc
index b7cc079cc488a57841ebfd14be2fc41087f48771..b232fcaf915cdeb9810f53bdd31d03381d28eec4 100644
--- a/components/mus/public/cpp/tests/window_server_shelltest_base.cc
+++ b/components/mus/public/cpp/tests/window_server_shelltest_base.cc
@@ -4,9 +4,11 @@
#include "components/mus/public/cpp/tests/window_server_shelltest_base.h"
+#include <memory>
+
#include "base/command_line.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ptr_util.h"
#include "components/mus/common/args.h"
#include "services/shell/public/cpp/shell_client.h"
#include "services/shell/public/cpp/shell_test.h"
@@ -51,8 +53,9 @@ WindowServerShellTestBase::WindowServerShellTestBase()
WindowServerShellTestBase::~WindowServerShellTestBase() {}
-scoped_ptr<shell::ShellClient> WindowServerShellTestBase::CreateShellClient() {
- return make_scoped_ptr(new WindowServerShellTestClient(this));
+std::unique_ptr<shell::ShellClient>
+WindowServerShellTestBase::CreateShellClient() {
+ return base::WrapUnique(new WindowServerShellTestClient(this));
}
} // namespace mus

Powered by Google App Engine
This is Rietveld 408576698