diff options
| author | Dale Curtis <dalecurtis@chromium.org> | 2015-04-29 19:48:32 -0700 |
|---|---|---|
| committer | Dale Curtis <dalecurtis@chromium.org> | 2015-04-30 02:49:33 +0000 |
| commit | bf4a43df64781252d250b7e2612e42ba0b969cae (patch) | |
| tree | 0abd979e39d6dc4a7f9fea2ef73aaddbd9e44204 | |
| parent | 5c969bdd1e488cb5c8a07d290cfc555c2fd7f0c2 (diff) | |
| download | chromium_src-bf4a43df64781252d250b7e2612e42ba0b969cae.zip chromium_src-bf4a43df64781252d250b7e2612e42ba0b969cae.tar.gz chromium_src-bf4a43df64781252d250b7e2612e42ba0b969cae.tar.bz2 | |
Merge to M43: "Fix always true if conditional for audio hang monitor."
Enum values are always true, so this did nothing. My local tests did
not include building a branded build, thus shame :(
BUG=482674
TEST=compiles
TBR=thakis
Review URL: https://codereview.chromium.org/1115833002
Cr-Commit-Position: refs/heads/master@{#327598}
(cherry picked from commit acb00cc01f2b0a8a8d6fd31b1b12ef296764bfb3)
Review URL: https://codereview.chromium.org/1120513002
Cr-Commit-Position: refs/branch-heads/2357@{#272}
Cr-Branched-From: 59d4494849b405682265ed5d3f5164573b9a939b-refs/heads/master@{#323860}
| -rw-r--r-- | chrome/browser/chrome_browser_main.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc index 94ae868..8ef24ce 100644 --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc @@ -669,7 +669,8 @@ void ChromeBrowserMainParts::SetupMetricsAndFieldTrials() { // 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 == chrome::VersionInfo::CHANNEL_UNKNOWN || - chrome::VersionInfo::CHANNEL_CANARY || chrome::VersionInfo::CHANNEL_DEV) { + channel == chrome::VersionInfo::CHANNEL_CANARY || + channel == chrome::VersionInfo::CHANNEL_DEV) { media::AudioManager::EnableHangMonitor(); } |