| Index: content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java
|
| diff --git a/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java b/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java
|
| index 249baf637c3cfd60c96e87b240ac07451a2babcf..c0d2cb504fd570bbc7d1b1fe0330e17d0ebc2f46 100644
|
| --- a/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java
|
| +++ b/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java
|
| @@ -15,7 +15,7 @@ import org.chromium.base.JNINamespace;
|
| import org.chromium.content.app.LibraryLoader;
|
| import org.chromium.content.browser.AndroidBrowserProcess;
|
| import org.chromium.content.common.ProcessInitException;
|
| -import org.chromium.ui.gfx.ActivityNativeWindow;
|
| +import org.chromium.ui.gfx.ActivityWindowAndroid;
|
| import org.chromium.content_shell.ShellManager;
|
|
|
| @JNINamespace("content")
|
| @@ -23,7 +23,7 @@ public class ContentBrowserTestsActivity extends Activity {
|
| private static final String TAG = "ChromeBrowserTestsActivity";
|
|
|
| private ShellManager mShellManager;
|
| - private ActivityNativeWindow mActivityNativeWindow;
|
| + private ActivityWindowAndroid mActivityWindowAndroid;
|
|
|
| @Override
|
| public void onCreate(Bundle savedInstanceState) {
|
| @@ -40,8 +40,8 @@ public class ContentBrowserTestsActivity extends Activity {
|
| (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
|
| View view = inflater.inflate(R.layout.test_activity, null);
|
| mShellManager = (ShellManager) view.findViewById(R.id.shell_container);
|
| - mActivityNativeWindow = new ActivityNativeWindow(this);
|
| - mShellManager.setWindow(mActivityNativeWindow);
|
| + mActivityWindowAndroid = new ActivityWindowAndroid(this);
|
| + mShellManager.setWindow(mActivityWindowAndroid);
|
|
|
| Log.i(TAG, "Running tests");
|
| runTests();
|
|
|