Merge from Chromium at DEPS revision 228962

This commit was generated by merge_to_master.py.

Change-Id: I23bd7d7766f213fd52f28ae5e1ecc6ae9df905ea
diff --git a/chrome/browser/jankometer.cc b/chrome/browser/jankometer.cc
index 4cfbc41..a5d841d 100644
--- a/chrome/browser/jankometer.cc
+++ b/chrome/browser/jankometer.cc
@@ -48,8 +48,10 @@
 // considering it delayed.
 const int kMaxMessageProcessingMs = 100;
 
+#if defined(OS_WIN)
 // TODO(brettw) Consider making this a pref.
 const bool kPlaySounds = false;
+#endif
 
 //------------------------------------------------------------------------------
 // Provide a special watchdog to make it easy to set the breakpoint on this