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

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

Issue 3447008: base: Finish moving the SplitString functions from string_util.h to string_split.h (Closed) Base URL: git://git.chromium.org/chromium.git
Patch Set: chromeos fixes 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
« no previous file with comments | « chrome/test/ui/dom_checker_uitest.cc ('k') | chrome/test/webdriver/dispatch.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
11 11
12 #include <set> 12 #include <set>
13 #include <vector> 13 #include <vector>
14 14
15 #include "app/sql/connection.h" 15 #include "app/sql/connection.h"
16 #include "base/base_switches.h" 16 #include "base/base_switches.h"
17 #include "base/command_line.h" 17 #include "base/command_line.h"
18 #include "base/environment.h" 18 #include "base/environment.h"
19 #include "base/file_path.h" 19 #include "base/file_path.h"
20 #include "base/file_util.h" 20 #include "base/file_util.h"
21 #include "base/path_service.h" 21 #include "base/path_service.h"
22 #include "base/platform_thread.h" 22 #include "base/platform_thread.h"
23 #include "base/process_util.h" 23 #include "base/process_util.h"
24 #include "base/scoped_ptr.h" 24 #include "base/scoped_ptr.h"
25 #include "base/scoped_temp_dir.h" 25 #include "base/scoped_temp_dir.h"
26 #include "base/string_number_conversions.h" 26 #include "base/string_number_conversions.h"
27 #include "base/string_split.h"
27 #include "base/test/test_file_util.h" 28 #include "base/test/test_file_util.h"
28 #include "base/time.h" 29 #include "base/time.h"
29 #include "base/utf_string_conversions.h" 30 #include "base/utf_string_conversions.h"
30 #include "chrome/app/chrome_dll_resource.h" 31 #include "chrome/app/chrome_dll_resource.h"
31 #include "chrome/browser/net/url_fixer_upper.h" 32 #include "chrome/browser/net/url_fixer_upper.h"
32 #include "chrome/common/chrome_constants.h" 33 #include "chrome/common/chrome_constants.h"
33 #include "chrome/common/chrome_paths.h" 34 #include "chrome/common/chrome_paths.h"
34 #include "chrome/common/chrome_switches.h" 35 #include "chrome/common/chrome_switches.h"
35 #include "chrome/common/debug_flags.h" 36 #include "chrome/common/debug_flags.h"
36 #include "chrome/common/logging_chrome.h" 37 #include "chrome/common/logging_chrome.h"
(...skipping 1121 matching lines...) Expand 10 before | Expand all | Expand 10 after
1158 UITestBase::TearDown(); 1159 UITestBase::TearDown();
1159 PlatformTest::TearDown(); 1160 PlatformTest::TearDown();
1160 } 1161 }
1161 1162
1162 AutomationProxy* UITest::CreateAutomationProxy(int execution_timeout) { 1163 AutomationProxy* UITest::CreateAutomationProxy(int execution_timeout) {
1163 // Make the AutomationProxy disconnect the channel on the first error, 1164 // Make the AutomationProxy disconnect the channel on the first error,
1164 // so that we avoid spending a lot of time in timeouts. The browser is likely 1165 // so that we avoid spending a lot of time in timeouts. The browser is likely
1165 // hosed if we hit those errors. 1166 // hosed if we hit those errors.
1166 return new AutomationProxy(execution_timeout, true); 1167 return new AutomationProxy(execution_timeout, true);
1167 } 1168 }
OLDNEW
« no previous file with comments | « chrome/test/ui/dom_checker_uitest.cc ('k') | chrome/test/webdriver/dispatch.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698