OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/base/test_launcher_utils.h" | 5 #include "chrome/test/base/test_launcher_utils.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/environment.h" | 8 #include "base/environment.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
(...skipping 10 matching lines...) Expand all Loading... |
21 namespace test_launcher_utils { | 21 namespace test_launcher_utils { |
22 | 22 |
23 void PrepareBrowserCommandLineForTests(CommandLine* command_line) { | 23 void PrepareBrowserCommandLineForTests(CommandLine* command_line) { |
24 // Turn off tip loading for tests; see http://crbug.com/17725. | 24 // Turn off tip loading for tests; see http://crbug.com/17725. |
25 command_line->AppendSwitch(switches::kDisableWebResources); | 25 command_line->AppendSwitch(switches::kDisableWebResources); |
26 | 26 |
27 // Turn off preconnects because they break the brittle python webserver; | 27 // Turn off preconnects because they break the brittle python webserver; |
28 // see http://crbug.com/60035. | 28 // see http://crbug.com/60035. |
29 command_line->AppendSwitch(switches::kDisablePreconnect); | 29 command_line->AppendSwitch(switches::kDisablePreconnect); |
30 | 30 |
| 31 // Turn off built-in asynchronous DNS client. |
| 32 command_line->AppendSwitch(switches::kDisableAsyncDns); |
| 33 |
31 // Don't show the first run ui. | 34 // Don't show the first run ui. |
32 command_line->AppendSwitch(switches::kNoFirstRun); | 35 command_line->AppendSwitch(switches::kNoFirstRun); |
33 | 36 |
34 // No default browser check, it would create an info-bar (if we are not the | 37 // No default browser check, it would create an info-bar (if we are not the |
35 // default browser) that could conflicts with some tests expectations. | 38 // default browser) that could conflicts with some tests expectations. |
36 command_line->AppendSwitch(switches::kNoDefaultBrowserCheck); | 39 command_line->AppendSwitch(switches::kNoDefaultBrowserCheck); |
37 | 40 |
38 // Enable warning level logging so that we can see when bad stuff happens. | 41 // Enable warning level logging so that we can see when bad stuff happens. |
39 command_line->AppendSwitch(switches::kEnableLogging); | 42 command_line->AppendSwitch(switches::kEnableLogging); |
40 command_line->AppendSwitchASCII(switches::kLoggingLevel, "1"); // warning | 43 command_line->AppendSwitchASCII(switches::kLoggingLevel, "1"); // warning |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
97 const std::string& implementation_name) { | 100 const std::string& implementation_name) { |
98 if (command_line->HasSwitch(switches::kUseGL)) | 101 if (command_line->HasSwitch(switches::kUseGL)) |
99 return false; | 102 return false; |
100 | 103 |
101 command_line->AppendSwitchASCII(switches::kUseGL, implementation_name); | 104 command_line->AppendSwitchASCII(switches::kUseGL, implementation_name); |
102 | 105 |
103 return true; | 106 return true; |
104 } | 107 } |
105 | 108 |
106 } // namespace test_launcher_utils | 109 } // namespace test_launcher_utils |
OLD | NEW |