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

Side by Side Diff: ui/views/mus/views_aura_mus_test_suite.cc

Issue 2579863002: Forces use mesa switch in mash_unittests and views_aura_mus_unittests (Closed)
Patch Set: 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
« no previous file with comments | « testing/buildbot/chromium.chromiumos.json ('k') | no next file » | 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_aura_mus_test_suite.h" 5 #include "ui/views/mus/views_aura_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/service_manager/background/background_service_manager.h" 16 #include "services/service_manager/background/background_service_manager.h"
17 #include "services/service_manager/public/cpp/connector.h" 17 #include "services/service_manager/public/cpp/connector.h"
18 #include "services/service_manager/public/cpp/service.h" 18 #include "services/service_manager/public/cpp/service.h"
19 #include "services/service_manager/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/aura/mus/window_tree_host_mus.h" 22 #include "ui/aura/mus/window_tree_host_mus.h"
23 #include "ui/aura/test/env_test_helper.h" 23 #include "ui/aura/test/env_test_helper.h"
24 #include "ui/aura/window.h" 24 #include "ui/aura/window.h"
25 #include "ui/gl/gl_switches.h"
25 #include "ui/views/mus/desktop_window_tree_host_mus.h" 26 #include "ui/views/mus/desktop_window_tree_host_mus.h"
26 #include "ui/views/mus/mus_client.h" 27 #include "ui/views/mus/mus_client.h"
27 #include "ui/views/mus/test_utils.h" 28 #include "ui/views/mus/test_utils.h"
28 #include "ui/views/test/platform_test_helper.h" 29 #include "ui/views/test/platform_test_helper.h"
29 #include "ui/views/test/views_test_helper_aura.h" 30 #include "ui/views/test/views_test_helper_aura.h"
30 #include "ui/views/views_delegate.h" 31 #include "ui/views/views_delegate.h"
31 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" 32 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
32 33
33 namespace views { 34 namespace views {
34 namespace { 35 namespace {
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 193
193 ViewsAuraMusTestSuite::~ViewsAuraMusTestSuite() {} 194 ViewsAuraMusTestSuite::~ViewsAuraMusTestSuite() {}
194 195
195 void ViewsAuraMusTestSuite::Initialize() { 196 void ViewsAuraMusTestSuite::Initialize() {
196 PlatformTestHelper::SetIsAuraMusClient(); 197 PlatformTestHelper::SetIsAuraMusClient();
197 // Let other services know that we're running in tests. Do this with a 198 // Let other services know that we're running in tests. Do this with a
198 // command line flag to avoid making blocking calls to other processes for 199 // command line flag to avoid making blocking calls to other processes for
199 // setup for tests (e.g. to unlock the screen in the window manager). 200 // setup for tests (e.g. to unlock the screen in the window manager).
200 EnsureCommandLineSwitch(ui::switches::kUseTestConfig); 201 EnsureCommandLineSwitch(ui::switches::kUseTestConfig);
201 202
203 EnsureCommandLineSwitch(switches::kOverrideUseGLWithOSMesaForTests);
204
202 ViewsTestSuite::Initialize(); 205 ViewsTestSuite::Initialize();
203 service_manager_connections_ = base::MakeUnique<ServiceManagerConnection>(); 206 service_manager_connections_ = base::MakeUnique<ServiceManagerConnection>();
204 } 207 }
205 208
206 void ViewsAuraMusTestSuite::Shutdown() { 209 void ViewsAuraMusTestSuite::Shutdown() {
207 service_manager_connections_.reset(); 210 service_manager_connections_.reset();
208 ViewsTestSuite::Shutdown(); 211 ViewsTestSuite::Shutdown();
209 } 212 }
210 213
211 } // namespace views 214 } // namespace views
OLDNEW
« no previous file with comments | « testing/buildbot/chromium.chromiumos.json ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698