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

Side by Side Diff: services/ui/common/run_all_shelltests.cc

Issue 2156093004: Use mojo for cursor control in ozone drm (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: corrected small code oversight Created 4 years, 4 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 | « no previous file | services/ui/gpu/gpu_service_mus.cc » ('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 "base/test/launcher/unit_test_launcher.h" 5 #include "base/test/launcher/unit_test_launcher.h"
6 #include "base/test/test_suite.h" 6 #include "base/test/test_suite.h"
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 #include "mojo/edk/embedder/embedder.h" 8 #include "mojo/edk/embedder/embedder.h"
9 #include "services/shell/background/background_shell_main.h" 9 #include "services/shell/background/background_shell_main.h"
10 10
11 #if defined(USE_OZONE) 11 #if defined(USE_OZONE)
12 #include "ui/ozone/public/ozone_platform.h" 12 #include "ui/ozone/public/ozone_platform.h"
13 #endif 13 #endif
14 14
15 class MusGpuTestSuite : public base::TestSuite { 15 class MusGpuTestSuite : public base::TestSuite {
16 public: 16 public:
17 MusGpuTestSuite(int argc, char** argv) : base::TestSuite(argc, argv) {} 17 MusGpuTestSuite(int argc, char** argv) : base::TestSuite(argc, argv) {}
18 18
19 private: 19 private:
20 void Initialize() override { 20 void Initialize() override {
21 base::TestSuite::Initialize(); 21 base::TestSuite::Initialize();
22 #if defined(USE_OZONE) 22 #if defined(USE_OZONE)
23 ui::OzonePlatform::InitializeForGPU(); 23 ui::OzonePlatform::InitParams params;
24 params.single_process = true;
25 ui::OzonePlatform::InitializeForGPU(params);
24 #endif 26 #endif
25 } 27 }
26 }; 28 };
27 29
28 int MasterProcessMain(int argc, char** argv) { 30 int MasterProcessMain(int argc, char** argv) {
29 MusGpuTestSuite test_suite(argc, argv); 31 MusGpuTestSuite test_suite(argc, argv);
30 mojo::edk::Init(); 32 mojo::edk::Init();
31 return base::LaunchUnitTests( 33 return base::LaunchUnitTests(
32 argc, argv, 34 argc, argv,
33 base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite))); 35 base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite)));
34 } 36 }
OLDNEW
« no previous file with comments | « no previous file | services/ui/gpu/gpu_service_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698