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

Side by Side Diff: services/ui/ws/window_server_service_test_base.cc

Issue 2559703003: Converts WindowTreeClientTest to be in terms of aura (Closed)
Patch Set: feedback Created 4 years 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/ws/window_server_service_test_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/service_manager/public/cpp/service.h" 12 #include "services/service_manager/public/cpp/service.h"
13 #include "services/service_manager/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"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 } 54 }
55 55
56 WindowServerServiceTestBase::~WindowServerServiceTestBase() {} 56 WindowServerServiceTestBase::~WindowServerServiceTestBase() {}
57 57
58 std::unique_ptr<service_manager::Service> 58 std::unique_ptr<service_manager::Service>
59 WindowServerServiceTestBase::CreateService() { 59 WindowServerServiceTestBase::CreateService() {
60 return base::MakeUnique<WindowServerServiceTestClient>(this); 60 return base::MakeUnique<WindowServerServiceTestClient>(this);
61 } 61 }
62 62
63 } // namespace ui 63 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698