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 527a4edba384b290a5f89dbd5510fa77ddeba80f..ad4425aac697cb471b11e543d9e1e6ae917a331b 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 |
@@ -14,10 +14,12 @@ import android.view.KeyEvent; |
import org.chromium.base.ChromiumActivity; |
import org.chromium.chrome.browser.DevToolsServer; |
import org.chromium.content.app.LibraryLoader; |
-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; |
@@ -60,11 +62,14 @@ 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); |
+ getActiveContentView().setContentViewClient(new ContentViewClient() { |
+ @Override |
+ public ContentVideoViewClient getContentVideoViewClient() { |
+ return new ActivityContentVideoViewClient(ChromiumTestShellActivity.this); |
+ } |
+ }); |
} |
@Override |