OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/automation/proxy_launcher.h" | 5 #include "chrome/test/automation/proxy_launcher.h" |
6 | 6 |
7 #include "base/environment.h" | 7 #include "base/environment.h" |
8 #include "base/file_util.h" | 8 #include "base/file_util.h" |
9 #include "base/string_number_conversions.h" | 9 #include "base/string_number_conversions.h" |
10 #include "base/string_split.h" | 10 #include "base/string_split.h" |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
73 ProxyLauncher::ProxyLauncher() | 73 ProxyLauncher::ProxyLauncher() |
74 : process_(base::kNullProcessHandle), | 74 : process_(base::kNullProcessHandle), |
75 process_id_(-1), | 75 process_id_(-1), |
76 shutdown_type_(WINDOW_CLOSE), | 76 shutdown_type_(WINDOW_CLOSE), |
77 no_sandbox_(CommandLine::ForCurrentProcess()->HasSwitch( | 77 no_sandbox_(CommandLine::ForCurrentProcess()->HasSwitch( |
78 switches::kNoSandbox)), | 78 switches::kNoSandbox)), |
79 full_memory_dump_(CommandLine::ForCurrentProcess()->HasSwitch( | 79 full_memory_dump_(CommandLine::ForCurrentProcess()->HasSwitch( |
80 switches::kFullMemoryCrashReport)), | 80 switches::kFullMemoryCrashReport)), |
81 dump_histograms_on_exit_(CommandLine::ForCurrentProcess()->HasSwitch( | 81 dump_histograms_on_exit_(CommandLine::ForCurrentProcess()->HasSwitch( |
82 switches::kDumpHistogramsOnExit)), | 82 switches::kDumpHistogramsOnExit)), |
| 83 #if defined(DCHECK_ALWAYS_ON) |
| 84 enable_dcheck_(true), |
| 85 #else |
83 enable_dcheck_(CommandLine::ForCurrentProcess()->HasSwitch( | 86 enable_dcheck_(CommandLine::ForCurrentProcess()->HasSwitch( |
84 switches::kEnableDCHECK)), | 87 switches::kEnableDCHECK)), |
| 88 #endif |
85 silent_dump_on_dcheck_(CommandLine::ForCurrentProcess()->HasSwitch( | 89 silent_dump_on_dcheck_(CommandLine::ForCurrentProcess()->HasSwitch( |
86 switches::kSilentDumpOnDCHECK)), | 90 switches::kSilentDumpOnDCHECK)), |
87 disable_breakpad_(CommandLine::ForCurrentProcess()->HasSwitch( | 91 disable_breakpad_(CommandLine::ForCurrentProcess()->HasSwitch( |
88 switches::kDisableBreakpad)), | 92 switches::kDisableBreakpad)), |
89 js_flags_(CommandLine::ForCurrentProcess()->GetSwitchValueASCII( | 93 js_flags_(CommandLine::ForCurrentProcess()->GetSwitchValueASCII( |
90 switches::kJavaScriptFlags)), | 94 switches::kJavaScriptFlags)), |
91 log_level_(CommandLine::ForCurrentProcess()->GetSwitchValueASCII( | 95 log_level_(CommandLine::ForCurrentProcess()->GetSwitchValueASCII( |
92 switches::kLoggingLevel)) { | 96 switches::kLoggingLevel)) { |
93 } | 97 } |
94 | 98 |
(...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
594 return LaunchBrowserAndServer(state, wait_for_initial_loads); | 598 return LaunchBrowserAndServer(state, wait_for_initial_loads); |
595 } | 599 } |
596 | 600 |
597 void AnonymousProxyLauncher::TerminateConnection() { | 601 void AnonymousProxyLauncher::TerminateConnection() { |
598 CloseBrowserAndServer(); | 602 CloseBrowserAndServer(); |
599 } | 603 } |
600 | 604 |
601 std::string AnonymousProxyLauncher::PrefixedChannelID() const { | 605 std::string AnonymousProxyLauncher::PrefixedChannelID() const { |
602 return channel_id_; | 606 return channel_id_; |
603 } | 607 } |
OLD | NEW |