summaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authortedchoc@chromium.org <tedchoc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-16 22:03:16 +0000
committertedchoc@chromium.org <tedchoc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-16 22:03:16 +0000
commit8b330900127e87bd2e46cce9cf5107251dcf5f6a (patch)
tree06efba966f236421802d2b27a21802947d420a2b /testing
parent91a9d6022e19427eaa39fdd7ef5af2ea7dd31869 (diff)
downloadchromium_src-8b330900127e87bd2e46cce9cf5107251dcf5f6a.zip
chromium_src-8b330900127e87bd2e46cce9cf5107251dcf5f6a.tar.gz
chromium_src-8b330900127e87bd2e46cce9cf5107251dcf5f6a.tar.bz2
Change method of activity tracking done in ActivityStatus.
Use the ability to track activity changes by registering a listener on the application. Also, this will manage the state of various activities on the java side. BUG=286071 Review URL: https://chromiumcodereview.appspot.com/23522032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223437 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing')
-rw-r--r--testing/android/AndroidManifest.xml3
-rw-r--r--testing/android/java/src/org/chromium/native_test/ChromeNativeTestActivity.java7
2 files changed, 3 insertions, 7 deletions
diff --git a/testing/android/AndroidManifest.xml b/testing/android/AndroidManifest.xml
index 73a0c14..a1afb56 100644
--- a/testing/android/AndroidManifest.xml
+++ b/testing/android/AndroidManifest.xml
@@ -12,7 +12,8 @@ found in the LICENSE file.
<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="17" />
- <application android:label="ChromeNativeTests">
+ <application android:label="ChromeNativeTests"
+ android:name="org.chromium.base.ChromiumApplication">
<activity android:name=".ChromeNativeTestActivity"
android:label="ChromeNativeTest"
android:configChanges="orientation|keyboardHidden">
diff --git a/testing/android/java/src/org/chromium/native_test/ChromeNativeTestActivity.java b/testing/android/java/src/org/chromium/native_test/ChromeNativeTestActivity.java
index 6486a14..b8e41c83 100644
--- a/testing/android/java/src/org/chromium/native_test/ChromeNativeTestActivity.java
+++ b/testing/android/java/src/org/chromium/native_test/ChromeNativeTestActivity.java
@@ -7,23 +7,18 @@ package org.chromium.native_test;
import android.app.Activity;
import android.content.Context;
import android.os.Bundle;
-import android.os.Environment;
import android.os.Handler;
import android.util.Log;
-import org.chromium.base.ChromiumActivity;
import org.chromium.base.PathUtils;
import org.chromium.base.PowerMonitor;
-
// TODO(cjhopman): This should not refer to content. NativeLibraries should be moved to base.
import org.chromium.content.app.NativeLibraries;
-import java.io.File;
-
// Android's NativeActivity is mostly useful for pure-native code.
// Our tests need to go up to our own java classes, which is not possible using
// the native activity class loader.
-public class ChromeNativeTestActivity extends ChromiumActivity {
+public class ChromeNativeTestActivity extends Activity {
private static final String TAG = "ChromeNativeTestActivity";
private static final String EXTRA_RUN_IN_SUB_THREAD = "RunInSubThread";
// We post a delayed task to run tests so that we do not block onCreate().