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

Side by Side Diff: chrome/test/ui/ui_test.h

Issue 8386007: Used use-gl=any instead of forcing osmesa for UI tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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 | Annotate | Revision Log
« no previous file with comments | « chrome/test/perf/frame_rate/frame_rate_tests.cc ('k') | chrome/test/ui/ui_test.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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #ifndef CHROME_TEST_UI_UI_TEST_H_ 5 #ifndef CHROME_TEST_UI_UI_TEST_H_
6 #define CHROME_TEST_UI_UI_TEST_H_ 6 #define CHROME_TEST_UI_UI_TEST_H_
7 #pragma once 7 #pragma once
8 8
9 // This file provides a common base for running UI unit tests, which operate 9 // This file provides a common base for running UI unit tests, which operate
10 // the entire browser application in a separate process for holistic 10 // the entire browser application in a separate process for holistic
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 349
350 // Launches browser and AutomationProxy. 350 // Launches browser and AutomationProxy.
351 scoped_ptr<ProxyLauncher> launcher_; 351 scoped_ptr<ProxyLauncher> launcher_;
352 352
353 // Are we using a profile with a complex theme? 353 // Are we using a profile with a complex theme?
354 ProfileType profile_type_; 354 ProfileType profile_type_;
355 355
356 // PID file for websocket server. 356 // PID file for websocket server.
357 FilePath websocket_pid_file_; 357 FilePath websocket_pid_file_;
358 358
359 // Whether to force use of mesa for GL rendering.
360 bool force_use_osmesa_;
361
362 // Whether to disable accelerated compositing for this test.
363 bool disable_accelerated_compositing_;
364
365 private: 359 private:
366 // Time the test was started (so we can check for new crash dumps) 360 // Time the test was started (so we can check for new crash dumps)
367 base::Time test_start_time_; 361 base::Time test_start_time_;
368 }; 362 };
369 363
370 class UITest : public UITestBase, public PlatformTest { 364 class UITest : public UITestBase, public PlatformTest {
371 protected: 365 protected:
372 UITest() {} 366 UITest() {}
373 explicit UITest(MessageLoop::Type msg_loop_type) 367 explicit UITest(MessageLoop::Type msg_loop_type)
374 : UITestBase(), PlatformTest(), message_loop_(msg_loop_type) { 368 : UITestBase(), PlatformTest(), message_loop_(msg_loop_type) {
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
490 #ifdef UNIT_TEST 484 #ifdef UNIT_TEST
491 std::ostream& operator<<(std::ostream& out, const std::wstring& wstr); 485 std::ostream& operator<<(std::ostream& out, const std::wstring& wstr);
492 486
493 template<typename T> 487 template<typename T>
494 std::ostream& operator<<(std::ostream& out, const ::scoped_ptr<T>& ptr) { 488 std::ostream& operator<<(std::ostream& out, const ::scoped_ptr<T>& ptr) {
495 return out << ptr.get(); 489 return out << ptr.get();
496 } 490 }
497 #endif // UNIT_TEST 491 #endif // UNIT_TEST
498 492
499 #endif // CHROME_TEST_UI_UI_TEST_H_ 493 #endif // CHROME_TEST_UI_UI_TEST_H_
OLDNEW
« no previous file with comments | « chrome/test/perf/frame_rate/frame_rate_tests.cc ('k') | chrome/test/ui/ui_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698