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

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

Issue 3915004: Convert LOG(INFO) to VLOG(1) - chrome/test/. (Closed) Base URL: svn://chrome-svn/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/ui/ui_layout_test.cc ('k') | chrome/test/ui_test_utils.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) 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 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 if (expected_crashes_ > 0 && actual_crashes == 0) { 167 if (expected_crashes_ > 0 && actual_crashes == 0) {
168 error_msg += L" "; 168 error_msg += L" ";
169 error_msg += kFailedNoCrashService; 169 error_msg += kFailedNoCrashService;
170 } 170 }
171 EXPECT_EQ(expected_crashes_, actual_crashes) << error_msg; 171 EXPECT_EQ(expected_crashes_, actual_crashes) << error_msg;
172 } 172 }
173 173
174 // TODO(phajdan.jr): get rid of set_command_execution_timeout_ms. 174 // TODO(phajdan.jr): get rid of set_command_execution_timeout_ms.
175 void UITestBase::set_command_execution_timeout_ms(int timeout) { 175 void UITestBase::set_command_execution_timeout_ms(int timeout) {
176 server_->set_command_execution_timeout_ms(timeout); 176 server_->set_command_execution_timeout_ms(timeout);
177 LOG(INFO) << "Automation command execution timeout set to " 177 VLOG(1) << "Automation command execution timeout set to " << timeout << " ms";
178 << timeout << " milli secs.";
179 } 178 }
180 179
181 AutomationProxy* UITestBase::CreateAutomationProxy(int execution_timeout) { 180 AutomationProxy* UITestBase::CreateAutomationProxy(int execution_timeout) {
182 return new AutomationProxy(execution_timeout, false); 181 return new AutomationProxy(execution_timeout, false);
183 } 182 }
184 183
185 void UITestBase::LaunchBrowserAndServer() { 184 void UITestBase::LaunchBrowserAndServer() {
186 // Set up IPC testing interface server. 185 // Set up IPC testing interface server.
187 server_.reset(CreateAutomationProxy( 186 server_.reset(CreateAutomationProxy(
188 TestTimeouts::command_execution_timeout_ms())); 187 TestTimeouts::command_execution_timeout_ms()));
(...skipping 576 matching lines...) Expand 10 before | Expand all | Expand 10 after
765 !show_window_, 764 !show_window_,
766 process); 765 process);
767 #elif defined(OS_POSIX) 766 #elif defined(OS_POSIX)
768 // Sometimes one needs to run the browser under a special environment 767 // Sometimes one needs to run the browser under a special environment
769 // (e.g. valgrind) without also running the test harness (e.g. python) 768 // (e.g. valgrind) without also running the test harness (e.g. python)
770 // under the special environment. Provide a way to wrap the browser 769 // under the special environment. Provide a way to wrap the browser
771 // commandline with a special prefix to invoke the special environment. 770 // commandline with a special prefix to invoke the special environment.
772 const char* browser_wrapper = getenv("BROWSER_WRAPPER"); 771 const char* browser_wrapper = getenv("BROWSER_WRAPPER");
773 if (browser_wrapper) { 772 if (browser_wrapper) {
774 command_line.PrependWrapper(browser_wrapper); 773 command_line.PrependWrapper(browser_wrapper);
775 LOG(INFO) << "BROWSER_WRAPPER was set, prefixing command_line with " 774 VLOG(1) << "BROWSER_WRAPPER was set, prefixing command_line with "
776 << browser_wrapper; 775 << browser_wrapper;
777 } 776 }
778 777
779 bool started = base::LaunchApp(command_line.argv(), 778 bool started = base::LaunchApp(command_line.argv(),
780 server_->fds_to_map(), 779 server_->fds_to_map(),
781 wait, 780 wait,
782 process); 781 process);
783 #endif 782 #endif
784 783
785 return started; 784 return started;
786 } 785 }
(...skipping 361 matching lines...) Expand 10 before | Expand all | Expand 10 after
1148 bool visible = !wait_for_open; 1147 bool visible = !wait_for_open;
1149 if (!browser->IsShelfVisible(&visible)) 1148 if (!browser->IsShelfVisible(&visible))
1150 continue; 1149 continue;
1151 if (visible == wait_for_open) 1150 if (visible == wait_for_open)
1152 return true; // Got the download shelf. 1151 return true; // Got the download shelf.
1153 } 1152 }
1154 1153
1155 ADD_FAILURE() << "Timeout reached in WaitForDownloadShelfVisibilityChange"; 1154 ADD_FAILURE() << "Timeout reached in WaitForDownloadShelfVisibilityChange";
1156 return false; 1155 return false;
1157 } 1156 }
OLDNEW
« no previous file with comments | « chrome/test/ui/ui_layout_test.cc ('k') | chrome/test/ui_test_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698