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

Side by Side Diff: chrome/test/base/interactive_ui_tests_main.cc

Issue 2498053004: Add InProcessContextProvider and update InProcessCommandBuffer (Closed)
Patch Set: Revert experiments and fix android_webview Created 4 years, 1 month 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "chrome/test/base/chrome_test_launcher.h" 5 #include "chrome/test/base/chrome_test_launcher.h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 #include "chrome/test/base/chrome_test_suite.h" 8 #include "chrome/test/base/chrome_test_suite.h"
9 #include "chrome/test/base/in_process_browser_test.h" 9 #include "chrome/test/base/in_process_browser_test.h"
10 #include "chrome/test/base/interactive_test_utils.h" 10 #include "chrome/test/base/interactive_test_utils.h"
11 #include "gpu/ipc/service/image_transport_surface.h"
11 #include "ui/base/test/ui_controls.h" 12 #include "ui/base/test/ui_controls.h"
12 13
13 #if defined(USE_AURA) 14 #if defined(USE_AURA)
14 #include "ui/aura/test/ui_controls_factory_aura.h" 15 #include "ui/aura/test/ui_controls_factory_aura.h"
15 #include "ui/base/test/ui_controls_aura.h" 16 #include "ui/base/test/ui_controls_aura.h"
16 #if defined(USE_X11) && !defined(OS_CHROMEOS) 17 #if defined(USE_X11) && !defined(OS_CHROMEOS)
17 #include "ui/views/test/ui_controls_factory_desktop_aurax11.h" 18 #include "ui/views/test/ui_controls_factory_desktop_aurax11.h"
18 #endif 19 #endif
19 #endif 20 #endif
20 21
21 #if defined(OS_CHROMEOS) 22 #if defined(OS_CHROMEOS)
22 #include "ash/test/ui_controls_factory_ash.h" 23 #include "ash/test/ui_controls_factory_ash.h"
23 #endif 24 #endif
24 25
25 #if defined(OS_WIN) 26 #if defined(OS_WIN)
26 #include "base/win/scoped_com_initializer.h" 27 #include "base/win/scoped_com_initializer.h"
27 #include "chrome/test/base/always_on_top_window_killer_win.h" 28 #include "chrome/test/base/always_on_top_window_killer_win.h"
28 #endif 29 #endif
29 30
30 class InteractiveUITestSuite : public ChromeTestSuite { 31 class InteractiveUITestSuite : public ChromeTestSuite {
31 public: 32 public:
32 InteractiveUITestSuite(int argc, char** argv) : ChromeTestSuite(argc, argv) {} 33 InteractiveUITestSuite(int argc, char** argv) : ChromeTestSuite(argc, argv) {}
33 ~InteractiveUITestSuite() override {} 34 ~InteractiveUITestSuite() override {}
34 35
35 protected: 36 protected:
36 // ChromeTestSuite overrides: 37 // ChromeTestSuite overrides:
37 void Initialize() override { 38 void Initialize() override {
38 ChromeTestSuite::Initialize(); 39 ChromeTestSuite::Initialize();
39 40
41 #if defined(OS_MACOSX)
42 gpu::ImageTransportSurface::SetAllowOSMesaForTesting(true);
43 #endif
44
40 // Only allow ui_controls to be used in interactive_ui_tests, since they 45 // Only allow ui_controls to be used in interactive_ui_tests, since they
41 // depend on focus and can't be sharded. 46 // depend on focus and can't be sharded.
42 ui_controls::EnableUIControls(); 47 ui_controls::EnableUIControls();
43 48
44 #if defined(OS_CHROMEOS) 49 #if defined(OS_CHROMEOS)
45 ui_controls::InstallUIControlsAura(ash::test::CreateAshUIControls()); 50 ui_controls::InstallUIControlsAura(ash::test::CreateAshUIControls());
46 #elif defined(USE_AURA) 51 #elif defined(USE_AURA)
47 #if defined(OS_WIN) 52 #if defined(OS_WIN)
48 com_initializer_.reset(new base::win::ScopedCOMInitializer()); 53 com_initializer_.reset(new base::win::ScopedCOMInitializer());
49 #endif 54 #endif
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 // Run interactive_ui_tests serially, they do not support running in parallel. 105 // Run interactive_ui_tests serially, they do not support running in parallel.
101 int default_jobs = 1; 106 int default_jobs = 1;
102 InteractiveUITestSuiteRunner runner; 107 InteractiveUITestSuiteRunner runner;
103 ChromeTestLauncherDelegate delegate(&runner); 108 ChromeTestLauncherDelegate delegate(&runner);
104 const int result = LaunchChromeTests(default_jobs, &delegate, argc, argv); 109 const int result = LaunchChromeTests(default_jobs, &delegate, argc, argv);
105 #if defined(OS_WIN) 110 #if defined(OS_WIN)
106 KillAlwaysOnTopWindows(RunType::AFTER_TEST); 111 KillAlwaysOnTopWindows(RunType::AFTER_TEST);
107 #endif 112 #endif
108 return result; 113 return result;
109 } 114 }
OLDNEW
« no previous file with comments | « chrome/test/base/chrome_unit_test_suite.cc ('k') | components/display_compositor/gl_helper_benchmark.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698