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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/mus/public/cpp/tests/window_server_shelltest_base.h" 5 #include "components/mus/public/cpp/tests/window_server_shelltest_base.h"
6 6
7 #include <memory>
8
7 #include "base/command_line.h" 9 #include "base/command_line.h"
8 #include "base/macros.h" 10 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/ptr_util.h"
10 #include "components/mus/common/args.h" 12 #include "components/mus/common/args.h"
11 #include "services/shell/public/cpp/shell_client.h" 13 #include "services/shell/public/cpp/shell_client.h"
12 #include "services/shell/public/cpp/shell_test.h" 14 #include "services/shell/public/cpp/shell_test.h"
13 #include "ui/gl/gl_switches.h" 15 #include "ui/gl/gl_switches.h"
14 16
15 namespace mus { 17 namespace mus {
16 18
17 namespace { 19 namespace {
18 20
19 const char kTestAppName[] = "mojo:mus_ws_unittests_app"; 21 const char kTestAppName[] = "mojo:mus_ws_unittests_app";
(...skipping 24 matching lines...) Expand all
44 } // namespace 46 } // namespace
45 47
46 WindowServerShellTestBase::WindowServerShellTestBase() 48 WindowServerShellTestBase::WindowServerShellTestBase()
47 : ShellTest(kTestAppName) { 49 : ShellTest(kTestAppName) {
48 EnsureCommandLineSwitch(kUseTestConfig); 50 EnsureCommandLineSwitch(kUseTestConfig);
49 EnsureCommandLineSwitch(switches::kOverrideUseGLWithOSMesaForTests); 51 EnsureCommandLineSwitch(switches::kOverrideUseGLWithOSMesaForTests);
50 } 52 }
51 53
52 WindowServerShellTestBase::~WindowServerShellTestBase() {} 54 WindowServerShellTestBase::~WindowServerShellTestBase() {}
53 55
54 scoped_ptr<shell::ShellClient> WindowServerShellTestBase::CreateShellClient() { 56 std::unique_ptr<shell::ShellClient>
55 return make_scoped_ptr(new WindowServerShellTestClient(this)); 57 WindowServerShellTestBase::CreateShellClient() {
58 return base::WrapUnique(new WindowServerShellTestClient(this));
56 } 59 }
57 60
58 } // namespace mus 61 } // namespace mus
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698