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

Side by Side Diff: ui/views/mus/views_mus_test_suite.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
« no previous file with comments | « ui/views/mus/screen_mus.cc ('k') | ui/views/mus/window_manager_connection.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "ui/views/mus/views_mus_test_suite.h" 5 #include "ui/views/mus/views_mus_test_suite.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <string> 8 #include <string>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/files/file_path.h" 11 #include "base/files/file_path.h"
12 #include "base/run_loop.h" 12 #include "base/run_loop.h"
13 #include "base/synchronization/waitable_event.h" 13 #include "base/synchronization/waitable_event.h"
14 #include "base/threading/simple_thread.h" 14 #include "base/threading/simple_thread.h"
15 #include "base/threading/thread.h" 15 #include "base/threading/thread.h"
16 #include "services/shell/background/background_shell.h" 16 #include "services/service_manager/background/background_shell.h"
17 #include "services/shell/public/cpp/connector.h" 17 #include "services/service_manager/public/cpp/connector.h"
18 #include "services/shell/public/cpp/service.h" 18 #include "services/service_manager/public/cpp/service.h"
19 #include "services/shell/public/cpp/service_context.h" 19 #include "services/service_manager/public/cpp/service_context.h"
20 #include "services/ui/common/switches.h" 20 #include "services/ui/common/switches.h"
21 #include "testing/gtest/include/gtest/gtest.h" 21 #include "testing/gtest/include/gtest/gtest.h"
22 #include "ui/views/mus/window_manager_connection.h" 22 #include "ui/views/mus/window_manager_connection.h"
23 #include "ui/views/test/platform_test_helper.h" 23 #include "ui/views/test/platform_test_helper.h"
24 #include "ui/views/views_delegate.h" 24 #include "ui/views/views_delegate.h"
25 25
26 namespace views { 26 namespace views {
27 namespace { 27 namespace {
28 28
29 void EnsureCommandLineSwitch(const std::string& name) { 29 void EnsureCommandLineSwitch(const std::string& name) {
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 ViewsTestSuite::Initialize(); 168 ViewsTestSuite::Initialize();
169 shell_connections_ = base::MakeUnique<ShellConnection>(); 169 shell_connections_ = base::MakeUnique<ShellConnection>();
170 } 170 }
171 171
172 void ViewsMusTestSuite::Shutdown() { 172 void ViewsMusTestSuite::Shutdown() {
173 shell_connections_.reset(); 173 shell_connections_.reset();
174 ViewsTestSuite::Shutdown(); 174 ViewsTestSuite::Shutdown();
175 } 175 }
176 176
177 } // namespace views 177 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/mus/screen_mus.cc ('k') | ui/views/mus/window_manager_connection.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698