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

Side by Side Diff: services/ui/public/cpp/tests/window_server_shelltest_base.cc

Issue 2419723002: Move services/shell to services/service_manager (Closed)
Patch Set: rebase Created 4 years, 2 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 "services/ui/public/cpp/tests/window_server_shelltest_base.h" 5 #include "services/ui/public/cpp/tests/window_server_shelltest_base.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/memory/ptr_util.h" 11 #include "base/memory/ptr_util.h"
12 #include "services/shell/public/cpp/service.h" 12 #include "services/service_manager/public/cpp/service.h"
13 #include "services/shell/public/cpp/service_test.h" 13 #include "services/service_manager/public/cpp/service_test.h"
14 #include "services/ui/common/switches.h" 14 #include "services/ui/common/switches.h"
15 #include "ui/gl/gl_switches.h" 15 #include "ui/gl/gl_switches.h"
16 16
17 namespace ui { 17 namespace ui {
18 18
19 namespace { 19 namespace {
20 20
21 const char kTestAppName[] = "service:mus_ws_unittests_app"; 21 const char kTestAppName[] = "service:mus_ws_unittests_app";
22 22
23 class WindowServerServiceTestClient : public shell::test::ServiceTestClient { 23 class WindowServerServiceTestClient : public shell::test::ServiceTestClient {
(...skipping 29 matching lines...) Expand all
53 } 53 }
54 54
55 WindowServerServiceTestBase::~WindowServerServiceTestBase() {} 55 WindowServerServiceTestBase::~WindowServerServiceTestBase() {}
56 56
57 std::unique_ptr<shell::Service> 57 std::unique_ptr<shell::Service>
58 WindowServerServiceTestBase::CreateService() { 58 WindowServerServiceTestBase::CreateService() {
59 return base::MakeUnique<WindowServerServiceTestClient>(this); 59 return base::MakeUnique<WindowServerServiceTestClient>(this);
60 } 60 }
61 61
62 } // namespace ui 62 } // namespace ui
OLDNEW
« no previous file with comments | « services/ui/public/cpp/tests/window_server_shelltest_base.h ('k') | services/ui/public/cpp/tests/window_server_test_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698