| Index: content/shell/android/browsertests/src/org/chromium/content_shell/browsertests/ContentShellBrowserTestActivity.java
|
| diff --git a/content/shell/android/browsertests/src/org/chromium/content_shell/browsertests/ContentShellBrowserTestActivity.java b/content/shell/android/browsertests/src/org/chromium/content_shell/browsertests/ContentShellBrowserTestActivity.java
|
| index 20d2d1549eafc46143e7945ffde5a9e3f713a6b3..4fc66772ce1d49ce012a04706d071b43f424adce 100644
|
| --- a/content/shell/android/browsertests/src/org/chromium/content_shell/browsertests/ContentShellBrowserTestActivity.java
|
| +++ b/content/shell/android/browsertests/src/org/chromium/content_shell/browsertests/ContentShellBrowserTestActivity.java
|
| @@ -16,6 +16,7 @@ import org.chromium.content.browser.BrowserStartupController;
|
| import org.chromium.content_shell.ShellManager;
|
| import org.chromium.native_test.NativeBrowserTestActivity;
|
| import org.chromium.ui.base.ActivityWindowAndroid;
|
| +import org.chromium.ui.base.ViewRoot;
|
| import org.chromium.ui.base.WindowAndroid;
|
|
|
| /** An Activity base class for running browser tests against ContentShell. */
|
| @@ -47,7 +48,7 @@ public abstract class ContentShellBrowserTestActivity extends NativeBrowserTestA
|
| setContentView(getTestActivityViewId());
|
| mShellManager = (ShellManager) findViewById(getShellManagerViewId());
|
| mWindowAndroid = new ActivityWindowAndroid(this);
|
| - mShellManager.setWindow(mWindowAndroid);
|
| + mShellManager.setViewRoot(ViewRoot.create(mWindowAndroid));
|
|
|
| Window wind = this.getWindow();
|
| wind.addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD);
|
|
|