Index: chrome/browser/chrome_browser_main.cc |
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc |
index dfdf8160c4b39f06debdc8bf3d4879cd5c6df9d5..6e0a187d8faaa0325f724ede74fcb41cd6a5c883 100644 |
--- a/chrome/browser/chrome_browser_main.cc |
+++ b/chrome/browser/chrome_browser_main.cc |
@@ -143,7 +143,6 @@ |
#include "content/public/common/content_switches.h" |
#include "content/public/common/main_function_params.h" |
#include "grit/platform_locale_settings.h" |
-#include "media/audio/audio_manager.h" |
#include "net/base/net_module.h" |
#include "net/cookies/cookie_monster.h" |
#include "net/http/http_network_layer.h" |
@@ -743,14 +742,6 @@ void ChromeBrowserMainParts::SetupMetricsAndFieldTrials() { |
const version_info::Channel channel = chrome::GetChannel(); |
- // TODO(dalecurtis): Remove these checks and enable for all channels once we |
- // track down the root causes of crbug.com/422522 and crbug.com/478932. |
- if (channel == version_info::Channel::UNKNOWN || |
- channel == version_info::Channel::CANARY || |
- channel == version_info::Channel::DEV) { |
- media::AudioManager::EnableCrashKeyLoggingForAudioThreadHangs(); |
- } |
- |
// Enable profiler instrumentation depending on the channel. |
switch (channel) { |
case version_info::Channel::UNKNOWN: |