| Index: chrome/common/stack_sampling_configuration.cc
|
| diff --git a/chrome/common/stack_sampling_configuration.cc b/chrome/common/stack_sampling_configuration.cc
|
| index 79e148b8479f533bfc79a4b118d20d11861f6232..c2b0786442b1541f0c0f2ec144f5b300a16f3585 100644
|
| --- a/chrome/common/stack_sampling_configuration.cc
|
| +++ b/chrome/common/stack_sampling_configuration.cc
|
| @@ -7,7 +7,6 @@
|
| #include "base/command_line.h"
|
| #include "base/lazy_instance.h"
|
| #include "base/rand_util.h"
|
| -#include "build/build_config.h"
|
| #include "chrome/common/channel_info.h"
|
| #include "chrome/common/chrome_switches.h"
|
| #include "components/version_info/version_info.h"
|
| @@ -18,26 +17,16 @@
|
| base::LazyInstance<StackSamplingConfiguration>::Leaky g_configuration =
|
| LAZY_INSTANCE_INITIALIZER;
|
|
|
| -// The profiler is currently only implemented for Windows x64 and Mac x64.
|
| +// The profiler is currently only implemented for Windows x64, and only runs on
|
| +// trunk, canary, and dev.
|
| bool IsProfilerSupported() {
|
| -#if defined(OS_WIN) && defined(ARCH_CPU_X86_64)
|
| - #if defined(GOOGLE_CHROME_BUILD)
|
| - // Only run on canary and dev.
|
| - const version_info::Channel channel = chrome::GetChannel();
|
| - return channel == version_info::Channel::CANARY ||
|
| - channel == version_info::Channel::DEV;
|
| - #else
|
| - return true;
|
| - #endif
|
| -#elif defined(OS_MACOSX)
|
| - // This is experimental, so only run on trunk.
|
| - #if defined(GOOGLE_CHROME_BUILD)
|
| - return false;
|
| - #else
|
| - return true;
|
| - #endif
|
| +#if !defined(_WIN64)
|
| + return false;
|
| #else
|
| - return false;
|
| + const version_info::Channel channel = chrome::GetChannel();
|
| + return (channel == version_info::Channel::UNKNOWN ||
|
| + channel == version_info::Channel::CANARY ||
|
| + channel == version_info::Channel::DEV);
|
| #endif
|
| }
|
|
|
|
|