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

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

Issue 4724004: Group commandline settings in UI test and in process browser test. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 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
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 405 matching lines...) Expand 10 before | Expand all | Expand 10 after
416 // complex theme? 416 // complex theme?
417 FilePath websocket_pid_file_; // PID file for websocket server. 417 FilePath websocket_pid_file_; // PID file for websocket server.
418 ShutdownType shutdown_type_; // The method for shutting down 418 ShutdownType shutdown_type_; // The method for shutting down
419 // the browser. Used in ShutdownTest. 419 // the browser. Used in ShutdownTest.
420 420
421 private: 421 private:
422 bool LaunchBrowserHelper(const CommandLine& arguments, 422 bool LaunchBrowserHelper(const CommandLine& arguments,
423 bool wait, 423 bool wait,
424 base::ProcessHandle* process); 424 base::ProcessHandle* process);
425 425
426 // Config commandlines that are common to only UI tests.
427 void PrepareCommonUITestCommandline(CommandLine* arguments);
Paweł Hajdan Jr. 2010/11/11 10:15:25 nit: Same here.
428
426 // We want to have a current history database when we start the browser so 429 // We want to have a current history database when we start the browser so
427 // things like the NTP will have thumbnails. This method updates the dates 430 // things like the NTP will have thumbnails. This method updates the dates
428 // in the history to be more recent. 431 // in the history to be more recent.
429 void UpdateHistoryDates(); 432 void UpdateHistoryDates();
430 433
431 base::Time test_start_time_; // Time the test was started 434 base::Time test_start_time_; // Time the test was started
432 // (so we can check for new crash dumps) 435 // (so we can check for new crash dumps)
433 static bool no_sandbox_; 436 static bool no_sandbox_;
434 static bool safe_plugins_; 437 static bool safe_plugins_;
435 static bool full_memory_dump_; // If true, write full memory dump 438 static bool full_memory_dump_; // If true, write full memory dump
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
575 #ifdef UNIT_TEST 578 #ifdef UNIT_TEST
576 std::ostream& operator<<(std::ostream& out, const std::wstring& wstr); 579 std::ostream& operator<<(std::ostream& out, const std::wstring& wstr);
577 580
578 template<typename T> 581 template<typename T>
579 std::ostream& operator<<(std::ostream& out, const ::scoped_ptr<T>& ptr) { 582 std::ostream& operator<<(std::ostream& out, const ::scoped_ptr<T>& ptr) {
580 return out << ptr.get(); 583 return out << ptr.get();
581 } 584 }
582 #endif // UNIT_TEST 585 #endif // UNIT_TEST
583 586
584 #endif // CHROME_TEST_UI_UI_TEST_H_ 587 #endif // CHROME_TEST_UI_UI_TEST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698