Flip unified media pipeline to default-on w/ disabled holdback.

content/browser/media/encrypted_media_browsertest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/windows_version.h"
 #include "build/build_config.h"
 #include "content/browser/media/media_browsertest.h"
 #include "content/public/common/content_switches.h"
@@ skipping 175 matching lines @@
 #if defined(OS_ANDROID)
   return;
 #endif
   TestSimplePlayback("bear-320x240-opus-av_enc-v.webm", kWebMAudioVideo);
 }
 
 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, ConfigChangeVideo) {
   TestConfigChange();
 }
 
+// Playback of this video on Android w/ Spitzer enabled causes glitches. See
+// http://crbug.com/598963.
+#if !defined(OS_ANDROID)
 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, FrameSizeChangeVideo) {
   TestFrameSizeChange();
 }
+#endif
 
 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, UnknownKeySystemThrowsException) {
   RunEncryptedMediaTest(kDefaultEmePlayer,
                         "bear-a_enc-a.webm",
                         kWebMAudioOnly,
                         "com.example.foo",
                         MSE,
                         kEmeNotSupportedError);
 }
 
 }  // namespace content