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

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

Issue 2478323003: Ozone Linux: Fix linker errors in interactive_ui_tests (Closed)
Patch Set: Fix up macros 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 "ui/base/test/ui_controls.h" 11 #include "ui/base/test/ui_controls.h"
12 12
13 #if defined(USE_AURA) 13 #if defined(USE_AURA)
14 #include "ui/aura/test/ui_controls_factory_aura.h" 14 #include "ui/aura/test/ui_controls_factory_aura.h"
15 #include "ui/base/test/ui_controls_aura.h" 15 #include "ui/base/test/ui_controls_aura.h"
16 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 16 #if defined(USE_X11) && !defined(OS_CHROMEOS)
17 #include "ui/views/test/ui_controls_factory_desktop_aurax11.h" 17 #include "ui/views/test/ui_controls_factory_desktop_aurax11.h"
18 #endif 18 #endif
19 #endif 19 #endif
20 20
21 #if defined(OS_CHROMEOS) 21 #if defined(OS_CHROMEOS)
22 #include "ash/test/ui_controls_factory_ash.h" 22 #include "ash/test/ui_controls_factory_ash.h"
23 #endif 23 #endif
24 24
25 #if defined(OS_WIN) 25 #if defined(OS_WIN)
26 #include "base/win/scoped_com_initializer.h" 26 #include "base/win/scoped_com_initializer.h"
(...skipping 15 matching lines...) Expand all
42 ui_controls::EnableUIControls(); 42 ui_controls::EnableUIControls();
43 43
44 #if defined(OS_CHROMEOS) 44 #if defined(OS_CHROMEOS)
45 ui_controls::InstallUIControlsAura(ash::test::CreateAshUIControls()); 45 ui_controls::InstallUIControlsAura(ash::test::CreateAshUIControls());
46 #elif defined(USE_AURA) 46 #elif defined(USE_AURA)
47 #if defined(OS_WIN) 47 #if defined(OS_WIN)
48 com_initializer_.reset(new base::win::ScopedCOMInitializer()); 48 com_initializer_.reset(new base::win::ScopedCOMInitializer());
49 #endif 49 #endif
50 50
51 #if defined(OS_LINUX) 51 #if defined(OS_LINUX)
52 #if defined(USE_OZONE)
53 NOTIMPLEMENTED();
54 #else
52 ui_controls::InstallUIControlsAura( 55 ui_controls::InstallUIControlsAura(
53 views::test::CreateUIControlsDesktopAura()); 56 views::test::CreateUIControlsDesktopAura());
57 #endif // defined(USE_OZONE)
54 #else 58 #else
55 // TODO(win_ash): when running interactive_ui_tests for Win Ash, use above. 59 // TODO(win_ash): when running interactive_ui_tests for Win Ash, use above.
56 ui_controls::InstallUIControlsAura(aura::test::CreateUIControlsAura(NULL)); 60 ui_controls::InstallUIControlsAura(aura::test::CreateUIControlsAura(NULL));
57 #endif 61 #endif // defined(OS_LINUX)
58 #endif 62 #endif // defined(USE_AURA)
59 } 63 }
60 64
61 void Shutdown() override { 65 void Shutdown() override {
62 #if defined(OS_WIN) 66 #if defined(OS_WIN)
63 com_initializer_.reset(); 67 com_initializer_.reset();
64 #endif 68 #endif
65 } 69 }
66 70
67 private: 71 private:
68 #if defined(OS_WIN) 72 #if defined(OS_WIN)
(...skipping 27 matching lines...) Expand all
96 // Run interactive_ui_tests serially, they do not support running in parallel. 100 // Run interactive_ui_tests serially, they do not support running in parallel.
97 int default_jobs = 1; 101 int default_jobs = 1;
98 InteractiveUITestSuiteRunner runner; 102 InteractiveUITestSuiteRunner runner;
99 ChromeTestLauncherDelegate delegate(&runner); 103 ChromeTestLauncherDelegate delegate(&runner);
100 const int result = LaunchChromeTests(default_jobs, &delegate, argc, argv); 104 const int result = LaunchChromeTests(default_jobs, &delegate, argc, argv);
101 #if defined(OS_WIN) 105 #if defined(OS_WIN)
102 KillAlwaysOnTopWindows(RunType::AFTER_TEST); 106 KillAlwaysOnTopWindows(RunType::AFTER_TEST);
103 #endif 107 #endif
104 return result; 108 return result;
105 } 109 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698