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

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

Issue 164382: Merge 22925 - Test startup of new tab page with a complex theme.... (Closed) Base URL: svn://chrome-svn/chrome/branches/195/src/
Patch Set: Created 11 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 | Annotate | Revision Log
« no previous file with comments | « chrome/test/startup/startup_test.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')
Property Changes:
Added: svn:mergeinfo
Merged /trunk/src/chrome/test/ui/ui_test.h:r22925
Merged /branches/chrome_webkit_merge_branch/chrome/test/ui/ui_test.h:r69-2775
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 7
8 // This file provides a common base for running UI unit tests, which operate 8 // This file provides a common base for running UI unit tests, which operate
9 // the entire browser application in a separate process for holistic 9 // the entire browser application in a separate process for holistic
10 // functional testing. 10 // functional testing.
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 static std::wstring js_flags() { return js_flags_; } 339 static std::wstring js_flags() { return js_flags_; }
340 static void set_js_flags(const std::wstring& value) { 340 static void set_js_flags(const std::wstring& value) {
341 js_flags_ = value; 341 js_flags_ = value;
342 } 342 }
343 343
344 static std::wstring log_level() { return log_level_; } 344 static std::wstring log_level() { return log_level_; }
345 static void set_log_level(const std::wstring& value) { 345 static void set_log_level(const std::wstring& value) {
346 log_level_ = value; 346 log_level_ = value;
347 } 347 }
348 348
349 // Returns the directory name where the "typical" user data is that we use
350 // for testing.
351 static FilePath ComputeTypicalUserDataSource(int profile_type);
352
349 // Called by some tests that wish to have a base profile to start from. This 353 // Called by some tests that wish to have a base profile to start from. This
350 // "user data directory" (containing one or more profiles) will be recursively 354 // "user data directory" (containing one or more profiles) will be recursively
351 // copied into the user data directory for the test and the files will be 355 // copied into the user data directory for the test and the files will be
352 // evicted from the OS cache. To start with a blank profile, supply an empty 356 // evicted from the OS cache. To start with a blank profile, supply an empty
353 // string (the default). 357 // string (the default).
354 std::wstring template_user_data() const { return template_user_data_; } 358 std::wstring template_user_data() const { return template_user_data_; }
355 void set_template_user_data(const std::wstring& template_user_data) { 359 void set_template_user_data(const std::wstring& template_user_data) {
356 template_user_data_ = template_user_data; 360 template_user_data_ = template_user_data;
357 } 361 }
358 362
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
405 // error. 409 // error.
406 // Apparently needed for Windows buildbots (to workaround an error when 410 // Apparently needed for Windows buildbots (to workaround an error when
407 // file is in use). 411 // file is in use).
408 // TODO(phajdan.jr): Move to test_file_util if we need it in more places. 412 // TODO(phajdan.jr): Move to test_file_util if we need it in more places.
409 bool EvictFileFromSystemCacheWrapper(const FilePath& path); 413 bool EvictFileFromSystemCacheWrapper(const FilePath& path);
410 414
411 // Synchronously launches local http server normally used to run LayoutTests. 415 // Synchronously launches local http server normally used to run LayoutTests.
412 void StartHttpServer(const FilePath& root_directory); 416 void StartHttpServer(const FilePath& root_directory);
413 void StopHttpServer(); 417 void StopHttpServer();
414 418
419 // Profile theme type choices.
420 enum {
421 DEFAULT_THEME = 0,
422 COMPLEX_THEME = 1
423 } ProfileType;
424
415 private: 425 private:
416 // Check that no processes related to Chrome exist, displaying 426 // Check that no processes related to Chrome exist, displaying
417 // the given message if any do. 427 // the given message if any do.
418 void AssertAppNotRunning(const std::wstring& error_message); 428 void AssertAppNotRunning(const std::wstring& error_message);
419 429
420 // Common functionality for the public PrintResults methods. 430 // Common functionality for the public PrintResults methods.
421 void PrintResultsImpl(const std::string& measurement, 431 void PrintResultsImpl(const std::string& measurement,
422 const std::string& modifier, 432 const std::string& modifier,
423 const std::string& trace, 433 const std::string& trace,
424 const std::string& values, 434 const std::string& values,
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
517 #ifdef UNIT_TEST 527 #ifdef UNIT_TEST
518 std::ostream& operator<<(std::ostream& out, const std::wstring& wstr); 528 std::ostream& operator<<(std::ostream& out, const std::wstring& wstr);
519 529
520 template<typename T> 530 template<typename T>
521 std::ostream& operator<<(std::ostream& out, const ::scoped_ptr<T>& ptr) { 531 std::ostream& operator<<(std::ostream& out, const ::scoped_ptr<T>& ptr) {
522 return out << ptr.get(); 532 return out << ptr.get();
523 } 533 }
524 #endif // UNIT_TEST 534 #endif // UNIT_TEST
525 535
526 #endif // CHROME_TEST_UI_UI_TEST_H_ 536 #endif // CHROME_TEST_UI_UI_TEST_H_
OLDNEW
« no previous file with comments | « chrome/test/startup/startup_test.cc ('k') | chrome/test/ui/ui_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698