[aw] Reuse WebContents PowerSaveBlocker in fullscreen.

android_webview/javatests/src/org/chromium/android_webview/test/util/VideoTestWebServer.java

Index: android_webview/javatests/src/org/chromium/android_webview/test/util/VideoTestWebServer.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/util/VideoTestWebServer.java b/android_webview/javatests/src/org/chromium/android_webview/test/util/VideoTestWebServer.java
index f255cf66e34722503d695359695ced9afd806e30..143c3db7f571009d1ad5ed2f6c0af6fabbe33fbe 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/util/VideoTestWebServer.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/util/VideoTestWebServer.java
@@ -4,53 +4,32 @@
 
 package org.chromium.android_webview.test.util;
 
-import android.content.Context;
 import android.util.Pair;
 
 import org.chromium.net.test.util.TestWebServer;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
 import java.util.List;
 
 /**
  * This class is a WebServer provide video data.
  */
 public class VideoTestWebServer {
-
-    // VIDEO_ID must be kept in sync with the id in VIDEO_TEST_HTML_FILE and
-    // VIDEO_INSIDE_DIV_TEST_HTML_FILE.
-    public static final String VIDEO_ID = "video";
     public static final String ONE_PIXEL_ONE_FRAME_WEBM_FILENAME = "one_pixel_one_frame.webm";
     public static final String ONE_PIXEL_ONE_FRAME_WEBM_BASE64 =
-            "GkXfo0AgQoaBAUL3gQFC8oEEQvOBCEKCQAR3ZWJtQoeBAkKFgQIYU4BnQN8VSalmQCgq17FAAw9C" +
-            "QE2AQAZ3aGFtbXlXQUAGd2hhbW15RIlACECPQAAAAAAAFlSua0AxrkAu14EBY8WBAZyBACK1nEAD" +
-            "dW5khkAFVl9WUDglhohAA1ZQOIOBAeBABrCBlrqBlh9DtnVAdOeBAKNAboEAAIDyCACdASqWAJYA" +
-            "Pk0ci0WD+IBAAJiWlu4XdQTSq2H4MW0+sMO0gz8HMRe+0jRo0aNGjRo0aNGjRo0aNGjRo0aNGjRo" +
-            "0aNGjRo0aNGjRo0VAAD+/729RWRzH4mOZ9/O8Dl319afX4gsgAAA";
-    private static final String VIDEO_TEST_HTML_FILE = "full_screen_video_test.html";
-    private static final String VIDEO_INSIDE_DIV_TEST_HTML_FILE =
-            "full_screen_video_inside_div_test.html";
-    private static final String VIDEO_TEST_JS_FILE = "full_screen_video.js";
-
+            "GkXfo0AgQoaBAUL3gQFC8oEEQvOBCEKCQAR3ZWJtQoeBAkKFgQIYU4BnQN8VSalmQCgq17FAAw9C"
+            + "QE2AQAZ3aGFtbXlXQUAGd2hhbW15RIlACECPQAAAAAAAFlSua0AxrkAu14EBY8WBAZyBACK1nEAD"
+            + "dW5khkAFVl9WUDglhohAA1ZQOIOBAeBABrCBlrqBlh9DtnVAdOeBAKNAboEAAIDyCACdASqWAJYA"
+            + "Pk0ci0WD+IBAAJiWlu4XdQTSq2H4MW0+sMO0gz8HMRe+0jRo0aNGjRo0aNGjRo0aNGjRo0aNGjRo"
+            + "0aNGjRo0aNGjRo0VAAD+/729RWRzH4mOZ9/O8Dl319afX4gsgAAA";
     private String mOnePixelOneFrameWebmURL;
-    private String mFullScreenVideoTestURL;
-    private String mFullScreenVideoInsideDivTestURL;
     private TestWebServer mTestWebServer;
 
-    public VideoTestWebServer(Context context) throws Exception {
+    public VideoTestWebServer() throws Exception {
         mTestWebServer = TestWebServer.start();
         List<Pair<String, String>> headers = getWebmHeaders(true);
-        mOnePixelOneFrameWebmURL = mTestWebServer.setResponseBase64("/" +
-                ONE_PIXEL_ONE_FRAME_WEBM_FILENAME,
+        mOnePixelOneFrameWebmURL = mTestWebServer.setResponseBase64("/"
+                + ONE_PIXEL_ONE_FRAME_WEBM_FILENAME,
                 ONE_PIXEL_ONE_FRAME_WEBM_BASE64, headers);
-        mFullScreenVideoTestURL = initFullScreenVideoTest(context, VIDEO_TEST_HTML_FILE);
-        mFullScreenVideoInsideDivTestURL =
-                initFullScreenVideoTest(context, VIDEO_INSIDE_DIV_TEST_HTML_FILE);
-        mTestWebServer.setResponse("/" + VIDEO_TEST_JS_FILE,
-                loadAssetData(context, VIDEO_TEST_JS_FILE),
-                getHTMLHeaders(false));
     }
 
     /**
@@ -60,14 +39,6 @@ public class VideoTestWebServer {
         return mOnePixelOneFrameWebmURL;
     }
 
-    public String getFullScreenVideoTestURL() {
-        return mFullScreenVideoTestURL;
-    }
-
-    public String getFullScreenVideoInsideDivTestURL() {
-        return mFullScreenVideoInsideDivTestURL;
-    }
-
     public TestWebServer getTestWebServer() {
         return mTestWebServer;
     }
@@ -75,30 +46,4 @@ public class VideoTestWebServer {
     private static List<Pair<String, String>> getWebmHeaders(boolean disableCache) {
         return CommonResources.getContentTypeAndCacheHeaders("video/webm", disableCache);
     }
-
-    private static List<Pair<String, String>> getHTMLHeaders(boolean disableCache) {
-        return CommonResources.getContentTypeAndCacheHeaders("text/html", disableCache);
-    }
-
-    private String initFullScreenVideoTest(Context context, final String videoTestHtmlFile)
-            throws IOException {
-        String data = loadAssetData(context, videoTestHtmlFile);
-        return mTestWebServer.setResponse("/" + videoTestHtmlFile,
-                data.replace("VIDEO_FILE_URL", getOnePixelOneFrameWebmURL()),
-                getHTMLHeaders(false));
-    }
-
-    private String loadAssetData(Context context, String asset) throws IOException {
-        InputStream in = context.getAssets().open(asset);
-        ByteArrayOutputStream os = new ByteArrayOutputStream();
-        int buflen = 128;
-        byte[] buffer = new byte[buflen];
-        int len = in.read(buffer, 0, buflen);
-        while (len != -1) {
-            os.write(buffer, 0, len);
-            if (len < buflen) break;
-            len = in.read(buffer, 0, buflen);
-        }
-        return os.toString();
-    }
 }