Disable video overlay for WebView

android_webview/java/src/org/chromium/android_webview/AwSettings.java

Index: android_webview/java/src/org/chromium/android_webview/AwSettings.java
diff --git a/android_webview/java/src/org/chromium/android_webview/AwSettings.java b/android_webview/java/src/org/chromium/android_webview/AwSettings.java
index 07eaaeab23f10b17271ffc1e749834e397abfd62..ea93c487e7361672424d75e3a878d6b2ebc4c5c2 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwSettings.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwSettings.java
@@ -87,7 +87,7 @@ public class AwSettings {
     private boolean mSpatialNavigationEnabled;  // Default depends on device features.
     private boolean mEnableSupportedHardwareAcceleratedFeatures = false;
     private int mMixedContentMode = WebSettings.MIXED_CONTENT_NEVER_ALLOW;
-    private boolean mVideoOverlayForEmbeddedVideoEnabled = false;
+
     private boolean mForceVideoOverlayForTests = false;
     private boolean mOffscreenPreRaster = false;
     private int mDisabledMenuItems = MENU_ITEM_NONE;
@@ -1701,19 +1701,7 @@ public class AwSettings {
      * @param flag whether to enable the video overlay for the embedded video.
      */
     public void setVideoOverlayForEmbeddedVideoEnabled(final boolean enabled) {
-        synchronized (mAwSettingsLock) {
-            if (mVideoOverlayForEmbeddedVideoEnabled != enabled) {
-                mVideoOverlayForEmbeddedVideoEnabled = enabled;
-                mEventHandler.runOnUiThreadBlockingAndLocked(new Runnable() {
-                    @Override
-                    public void run() {
-                        if (mNativeAwSettings != 0) {
-                            nativeUpdateRendererPreferencesLocked(mNativeAwSettings);
-                        }
-                    }
-                });
-            }
-        }
+        // No-op, see http://crbug.com/616583
     }
 
     /**
@@ -1721,15 +1709,14 @@ public class AwSettings {
      * @return true if the WebView enables the video overlay for the embedded video.
      */
     public boolean getVideoOverlayForEmbeddedVideoEnabled() {
-        synchronized (mAwSettingsLock) {
-            return getVideoOverlayForEmbeddedVideoEnabledLocked();
-        }
+        // Always false, see http://crbug.com/616583
+        return false;
     }
 
     @CalledByNative
     private boolean getVideoOverlayForEmbeddedVideoEnabledLocked() {
-        assert Thread.holdsLock(mAwSettingsLock);
-        return mVideoOverlayForEmbeddedVideoEnabled;
+        // Always false, see http://crbug.com/616583
+        return false;
     }
 
     @VisibleForTesting