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

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

Issue 6015002: Rename WebKitTools->Tools. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 years 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 | « base/process_util_mac.mm ('k') | chrome/test/ui_test_utils.h » ('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 868 matching lines...) Expand 10 before | Expand all | Expand 10 after
879 } 879 }
880 880
881 static CommandLine* CreateHttpServerCommandLine() { 881 static CommandLine* CreateHttpServerCommandLine() {
882 FilePath src_path; 882 FilePath src_path;
883 // Get to 'src' dir. 883 // Get to 'src' dir.
884 PathService::Get(base::DIR_SOURCE_ROOT, &src_path); 884 PathService::Get(base::DIR_SOURCE_ROOT, &src_path);
885 885
886 FilePath script_path(src_path); 886 FilePath script_path(src_path);
887 script_path = script_path.AppendASCII("third_party"); 887 script_path = script_path.AppendASCII("third_party");
888 script_path = script_path.AppendASCII("WebKit"); 888 script_path = script_path.AppendASCII("WebKit");
889 script_path = script_path.AppendASCII("WebKitTools"); 889 script_path = script_path.AppendASCII("Tools");
890 script_path = script_path.AppendASCII("Scripts"); 890 script_path = script_path.AppendASCII("Scripts");
891 script_path = script_path.AppendASCII("new-run-webkit-httpd"); 891 script_path = script_path.AppendASCII("new-run-webkit-httpd");
892 892
893 CommandLine* cmd_line = CreatePythonCommandLine(); 893 CommandLine* cmd_line = CreatePythonCommandLine();
894 cmd_line->AppendArgPath(script_path); 894 cmd_line->AppendArgPath(script_path);
895 return cmd_line; 895 return cmd_line;
896 } 896 }
897 897
898 void UITest::StartHttpServer(const FilePath& root_directory) { 898 void UITest::StartHttpServer(const FilePath& root_directory) {
899 StartHttpServerWithPort(root_directory, 0); 899 StartHttpServerWithPort(root_directory, 0);
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after
1190 incorrect_state_count++; 1190 incorrect_state_count++;
1191 } 1191 }
1192 1192
1193 LOG(INFO) << "Elapsed time: " << (base::Time::Now() - start).InSecondsF() 1193 LOG(INFO) << "Elapsed time: " << (base::Time::Now() - start).InSecondsF()
1194 << " seconds" 1194 << " seconds"
1195 << " call failed " << fail_count << " times" 1195 << " call failed " << fail_count << " times"
1196 << " state was incorrect " << incorrect_state_count << " times"; 1196 << " state was incorrect " << incorrect_state_count << " times";
1197 ADD_FAILURE() << "Timeout reached in " << __FUNCTION__; 1197 ADD_FAILURE() << "Timeout reached in " << __FUNCTION__;
1198 return false; 1198 return false;
1199 } 1199 }
OLDNEW
« no previous file with comments | « base/process_util_mac.mm ('k') | chrome/test/ui_test_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698