Disable unprefixed EME when using "--mediadrm-enable-non-compositing".

android_webview/lib/main/aw_main_delegate.cc

 // Copyright (c) 2012 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 "android_webview/lib/main/aw_main_delegate.h"
 
 #include "android_webview/browser/aw_content_browser_client.h"
 #include "android_webview/browser/browser_view_renderer.h"
 #include "android_webview/browser/scoped_allow_wait_for_legacy_web_view_api.h"
 #include "android_webview/crash_reporter/aw_microdump_crash_reporter.h"
@@ skipping 61 matching lines @@
   // Not yet supported in single-process mode.
   cl->AppendSwitch(switches::kDisableSharedWorkers);
 
   // File system API not supported (requires some new API; internal bug 6930981)
   cl->AppendSwitch(switches::kDisableFileSystem);
 
   // Web Notification API and the Push API are not supported (crbug.com/434712)
   cl->AppendSwitch(switches::kDisableNotifications);
 
 #if defined(VIDEO_HOLE)
-  // Support EME/L1 with hole-punching.
+  // Support EME with hole-punching. For example, Widevine L1.
   cl->AppendSwitch(switches::kMediaDrmEnableNonCompositing);
+  cl->AppendSwitch(switches::kDisableEncryptedMedia);
 #endif
 
   // WebRTC hardware decoding is not supported, internal bug 15075307
   cl->AppendSwitch(switches::kDisableWebRtcHWDecoding);
 
   // This is needed for sharing textures across the different GL threads.
   cl->AppendSwitch(switches::kEnableThreadedTextureMailboxes);
 
   // This is needed to be able to mmap the V8 snapshot and ICU data file
   // directly from the WebView .apk.
@@ skipping 100 matching lines @@
 
 #if defined(VIDEO_HOLE)
 content::ExternalVideoSurfaceContainer*
 AwMainDelegate::CreateExternalVideoSurfaceContainer(
     content::WebContents* web_contents) {
   return new ExternalVideoSurfaceContainerImpl(web_contents);
 }
 #endif
 
 }  // namespace android_webview