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

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

Issue 3935001: Rename CommandLine::ARGUMENTS_ONLY to NO_PROGRAM. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 years, 2 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') | no next file » | 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) 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 #include "chrome/test/ui/ui_test.h" 5 #include "chrome/test/ui/ui_test.h"
6 6
7 #if defined(OS_POSIX) 7 #if defined(OS_POSIX)
8 #include <signal.h> 8 #include <signal.h>
9 #include <sys/types.h> 9 #include <sys/types.h>
10 #endif 10 #endif
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 bool UITestBase::disable_breakpad_ = false; 83 bool UITestBase::disable_breakpad_ = false;
84 std::string UITestBase::js_flags_ = ""; 84 std::string UITestBase::js_flags_ = "";
85 std::string UITestBase::log_level_ = ""; 85 std::string UITestBase::log_level_ = "";
86 86
87 // Uncomment this line to have the spawned process wait for the debugger to 87 // Uncomment this line to have the spawned process wait for the debugger to
88 // attach. This only works on Windows. On posix systems, you can set the 88 // attach. This only works on Windows. On posix systems, you can set the
89 // BROWSER_WRAPPER env variable to wrap the browser process. 89 // BROWSER_WRAPPER env variable to wrap the browser process.
90 // #define WAIT_FOR_DEBUGGER_ON_OPEN 1 90 // #define WAIT_FOR_DEBUGGER_ON_OPEN 1
91 91
92 UITestBase::UITestBase() 92 UITestBase::UITestBase()
93 : launch_arguments_(CommandLine::ARGUMENTS_ONLY), 93 : launch_arguments_(CommandLine::NO_PROGRAM),
94 expected_errors_(0), 94 expected_errors_(0),
95 expected_crashes_(0), 95 expected_crashes_(0),
96 homepage_(chrome::kAboutBlankURL), 96 homepage_(chrome::kAboutBlankURL),
97 wait_for_initial_loads_(true), 97 wait_for_initial_loads_(true),
98 dom_automation_enabled_(false), 98 dom_automation_enabled_(false),
99 process_(base::kNullProcessHandle), 99 process_(base::kNullProcessHandle),
100 process_id_(-1), 100 process_id_(-1),
101 show_window_(false), 101 show_window_(false),
102 clear_profile_(true), 102 clear_profile_(true),
103 include_testing_id_(true), 103 include_testing_id_(true),
104 enable_file_cookies_(true), 104 enable_file_cookies_(true),
105 profile_type_(UITestBase::DEFAULT_THEME), 105 profile_type_(UITestBase::DEFAULT_THEME),
106 shutdown_type_(UITestBase::WINDOW_CLOSE), 106 shutdown_type_(UITestBase::WINDOW_CLOSE),
107 temp_profile_dir_(new ScopedTempDir()) { 107 temp_profile_dir_(new ScopedTempDir()) {
108 PathService::Get(chrome::DIR_APP, &browser_directory_); 108 PathService::Get(chrome::DIR_APP, &browser_directory_);
109 PathService::Get(chrome::DIR_TEST_DATA, &test_data_directory_); 109 PathService::Get(chrome::DIR_TEST_DATA, &test_data_directory_);
110 } 110 }
111 111
112 UITestBase::UITestBase(MessageLoop::Type msg_loop_type) 112 UITestBase::UITestBase(MessageLoop::Type msg_loop_type)
113 : launch_arguments_(CommandLine::ARGUMENTS_ONLY), 113 : launch_arguments_(CommandLine::NO_PROGRAM),
114 expected_errors_(0), 114 expected_errors_(0),
115 expected_crashes_(0), 115 expected_crashes_(0),
116 homepage_(chrome::kAboutBlankURL), 116 homepage_(chrome::kAboutBlankURL),
117 wait_for_initial_loads_(true), 117 wait_for_initial_loads_(true),
118 dom_automation_enabled_(false), 118 dom_automation_enabled_(false),
119 process_(base::kNullProcessHandle), 119 process_(base::kNullProcessHandle),
120 process_id_(-1), 120 process_id_(-1),
121 show_window_(false), 121 show_window_(false),
122 clear_profile_(true), 122 clear_profile_(true),
123 include_testing_id_(true), 123 include_testing_id_(true),
(...skipping 1024 matching lines...) Expand 10 before | Expand all | Expand 10 after
1148 bool visible = !wait_for_open; 1148 bool visible = !wait_for_open;
1149 if (!browser->IsShelfVisible(&visible)) 1149 if (!browser->IsShelfVisible(&visible))
1150 continue; 1150 continue;
1151 if (visible == wait_for_open) 1151 if (visible == wait_for_open)
1152 return true; // Got the download shelf. 1152 return true; // Got the download shelf.
1153 } 1153 }
1154 1154
1155 ADD_FAILURE() << "Timeout reached in WaitForDownloadShelfVisibilityChange"; 1155 ADD_FAILURE() << "Timeout reached in WaitForDownloadShelfVisibilityChange";
1156 return false; 1156 return false;
1157 } 1157 }
OLDNEW
« no previous file with comments | « chrome/test/startup/startup_test.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698