Refactoring ContentVideoViewContextDelegate.java

chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java

Index: chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java
diff --git a/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java b/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java
index 25582462a18b24cc530176254ae0d58a4c32c48d..0675d1ffe81ebb14133a114e5b163e2547af2a3c 100644
--- a/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java
+++ b/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java
@@ -13,10 +13,12 @@ import android.view.KeyEvent;
 
 import org.chromium.base.ChromiumActivity;
 import org.chromium.chrome.browser.DevToolsServer;
-import org.chromium.content.browser.ActivityContentVideoViewDelegate;
+import org.chromium.content.browser.ActivityContentVideoViewClient;
 import org.chromium.content.browser.AndroidBrowserProcess;
 import org.chromium.content.browser.ContentVideoView;
+import org.chromium.content.browser.ContentVideoViewClient;
 import org.chromium.content.browser.ContentView;
+import org.chromium.content.browser.ContentViewClient;
 import org.chromium.content.browser.DeviceUtils;
 import org.chromium.content.common.CommandLine;
 import org.chromium.content.common.ProcessInitException;
@@ -59,9 +61,6 @@ public class ChromiumTestShellActivity extends ChromiumActivity {
         mWindow.restoreInstanceState(savedInstanceState);
         mTabManager.setWindow(mWindow);
 
-        ContentVideoView.registerContentVideoViewContextDelegate(
-                new ActivityContentVideoViewDelegate(this));
-
         mDevToolsServer = new DevToolsServer(true, "chromium_testshell_devtools_remote");
         mDevToolsServer.setRemoteDebuggingEnabled(true);
     }
@@ -144,6 +143,12 @@ public class ChromiumTestShellActivity extends ChromiumActivity {
      */
     public void createTab(String url) {
         mTabManager.createTab(url);
+        getActiveContentView().setContentViewClient(new ContentViewClient() {
+            @Override
+            public ContentVideoViewClient getContentVideoViewClient() {
+                return new ActivityContentVideoViewClient(ChromiumTestShellActivity.this);
+            }
+        });
     }
 
     private void waitForDebuggerIfNeeded() {