Chromium Code Reviews| 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/app/chrome_main_delegate.h" | 5 #include "chrome/app/chrome_main_delegate.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include "base/base_paths.h" | 9 #include "base/base_paths.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 193 GetProcAddress(GetModuleHandle(NULL), "IsSandboxedProcess")); | 193 GetProcAddress(GetModuleHandle(NULL), "IsSandboxedProcess")); |
| 194 return is_sandboxed_process_func && is_sandboxed_process_func(); | 194 return is_sandboxed_process_func && is_sandboxed_process_func(); |
| 195 } | 195 } |
| 196 | 196 |
| 197 bool UseHooks() { | 197 bool UseHooks() { |
| 198 #if defined(ARCH_CPU_X86_64) | 198 #if defined(ARCH_CPU_X86_64) |
| 199 return false; | 199 return false; |
| 200 #elif defined(NDEBUG) | 200 #elif defined(NDEBUG) |
| 201 version_info::Channel channel = chrome::GetChannel(); | 201 version_info::Channel channel = chrome::GetChannel(); |
| 202 if (channel == version_info::Channel::CANARY || | 202 if (channel == version_info::Channel::CANARY || |
| 203 channel == version_info::Channel::DEV) { | 203 channel == version_info::Channel::DEV || |
| 204 channel == version_info::Channel::UNKNOWN) { | |
|
cpu_(ooo_6.6-7.5)
2016/01/19 22:53:49
do we need this for the tests?
Will Harris
2016/01/19 23:06:33
AFAIK the bots run on UNKNOWN channel. This is wha
| |
| 204 return true; | 205 return true; |
| 205 } | 206 } |
| 206 | 207 |
| 207 return false; | 208 return false; |
| 208 #else // NDEBUG | 209 #else // NDEBUG |
| 209 return true; | 210 return true; |
| 210 #endif | 211 #endif |
| 211 } | 212 } |
| 212 | 213 |
| 213 #endif // defined(OS_WIN) | 214 #endif // defined(OS_WIN) |
| (...skipping 802 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1016 case version_info::Channel::CANARY: | 1017 case version_info::Channel::CANARY: |
| 1017 return true; | 1018 return true; |
| 1018 case version_info::Channel::DEV: | 1019 case version_info::Channel::DEV: |
| 1019 case version_info::Channel::BETA: | 1020 case version_info::Channel::BETA: |
| 1020 case version_info::Channel::STABLE: | 1021 case version_info::Channel::STABLE: |
| 1021 default: | 1022 default: |
| 1022 // Don't enable instrumentation. | 1023 // Don't enable instrumentation. |
| 1023 return false; | 1024 return false; |
| 1024 } | 1025 } |
| 1025 } | 1026 } |
| OLD | NEW |