Enable hole-punching in Android by default.

This CL also enables the tests for hole-punching.

BUG=329447
R=boliu@chromium.org, qinmin@chromium.org

Review URL: https://codereview.chromium.org/264893002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269464 0039d316-1c4b-4281-b951-d872f2087c98

android_webview/javatests/src/org/chromium/android_webview/test/ExternalVideoSurfaceContainerTest.java

@@ -10,7 +10,6 @@ import android.test.suitebuilder.annotation.SmallTest;
 import org.chromium.android_webview.ExternalVideoSurfaceContainer;
 import org.chromium.android_webview.test.util.VideoTestUtil;
 import org.chromium.base.CommandLine;
-import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Feature;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.browser.test.util.CallbackHelper;
@@ -98,12 +97,8 @@ public class ExternalVideoSurfaceContainerTest extends AwTestBase {
         });
     }
 
-    /*
     @SmallTest
     @Feature({"AndroidWebView"})
-    TODO(ycheo): Enable this after turing on the flag 'video_hole=1'.
-    */
-    @DisabledTest
     public void testEnableVideoOverlayForEmbeddedVideo() throws Throwable {
         setUpMockExternalVideoSurfaceContainer();
 

build/common.gypi

@@ -558,6 +558,9 @@
        # Enable the Syzygy optimization step.
       'syzygy_optimize%': 0,
 
+      # Enable hole punching for the protected video.
+      'video_hole%': 0,
+
       'conditions': [
         # A flag for POSIX platforms
         ['OS=="win"', {
@@ -676,6 +679,7 @@
            # Set to 1 once we have a notification system for Android.
            # http://crbug.com/115320
           'notifications%': 0,
+          'video_hole%': 1,
         }],
 
         # Android OS includes support for proprietary codecs regardless of
@@ -1078,6 +1082,7 @@
     'proprietary_codecs%': '<(proprietary_codecs)',
     'use_goma%': '<(use_goma)',
     'gomadir%': '<(gomadir)',
+    'video_hole%': '<(video_hole)',
 
     # Use system protobuf instead of bundled one.
     'use_system_protobuf%': 0,
@@ -1361,9 +1366,6 @@
     # Force disable libstdc++ debug mode.
     'disable_glibcxx_debug%': 0,
 
-    # Set to 1 to compile with the hole punching for the protected video.
-    'video_hole%': 0,
-
     # Set to 1 to compile with MSE support for MPEG2 TS
     'enable_mpeg2ts_stream_parser%': 0,