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

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

Issue 7171005: Always support locating Chromium-branded builds. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: disable chrome switching in UIPerfTest and PageCyclerReferenceTest Created 9 years, 6 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/ui/ui_perf_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')
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 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 // If true the profile is cleared before launching. Default is true. 318 // If true the profile is cleared before launching. Default is true.
319 bool clear_profile_; 319 bool clear_profile_;
320 320
321 // Should we supply the testing channel id 321 // Should we supply the testing channel id
322 // on the command line? Default is true. 322 // on the command line? Default is true.
323 bool include_testing_id_; 323 bool include_testing_id_;
324 324
325 // Enable file cookies, default is true. 325 // Enable file cookies, default is true.
326 bool enable_file_cookies_; 326 bool enable_file_cookies_;
327 327
328 // Enable use of switching to Chrome branding, default is true.
329 bool enable_chrome_branding_;
330
328 // Launches browser and AutomationProxy. 331 // Launches browser and AutomationProxy.
329 scoped_ptr<ProxyLauncher> launcher_; 332 scoped_ptr<ProxyLauncher> launcher_;
330 333
331 // Are we using a profile with a complex theme? 334 // Are we using a profile with a complex theme?
332 ProxyLauncher::ProfileType profile_type_; 335 ProxyLauncher::ProfileType profile_type_;
333 336
334 // PID file for websocket server. 337 // PID file for websocket server.
335 FilePath websocket_pid_file_; 338 FilePath websocket_pid_file_;
336 339
337 private: 340 private:
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
462 #ifdef UNIT_TEST 465 #ifdef UNIT_TEST
463 std::ostream& operator<<(std::ostream& out, const std::wstring& wstr); 466 std::ostream& operator<<(std::ostream& out, const std::wstring& wstr);
464 467
465 template<typename T> 468 template<typename T>
466 std::ostream& operator<<(std::ostream& out, const ::scoped_ptr<T>& ptr) { 469 std::ostream& operator<<(std::ostream& out, const ::scoped_ptr<T>& ptr) {
467 return out << ptr.get(); 470 return out << ptr.get();
468 } 471 }
469 #endif // UNIT_TEST 472 #endif // UNIT_TEST
470 473
471 #endif // CHROME_TEST_UI_UI_TEST_H_ 474 #endif // CHROME_TEST_UI_UI_TEST_H_
OLDNEW
« no previous file with comments | « chrome/test/ui/ui_perf_test.cc ('k') | chrome/test/ui/ui_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698