diff options
| author | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-16 11:58:08 +0000 |
|---|---|---|
| committer | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-16 11:58:08 +0000 |
| commit | a614f15662de81caafbf02c7afc6beb0026fb827 (patch) | |
| tree | 3ab396cb558b73c1719c08a7946414a8972056dc /testing/android | |
| parent | 8a429d0f0a8300776fc65eeec0831c3b3840a5a3 (diff) | |
| download | chromium_src-a614f15662de81caafbf02c7afc6beb0026fb827.zip chromium_src-a614f15662de81caafbf02c7afc6beb0026fb827.tar.gz chromium_src-a614f15662de81caafbf02c7afc6beb0026fb827.tar.bz2 | |
Android: Integrates native and java SystemMonitor.
BUG=154293
Review URL: https://chromiumcodereview.appspot.com/11027024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162124 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing/android')
| -rw-r--r-- | testing/android/java/src/org/chromium/native_test/ChromeNativeTestActivity.java | 4 |
1 files changed, 4 insertions, 0 deletions
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 b984c48..77022506 100644 --- a/testing/android/java/src/org/chromium/native_test/ChromeNativeTestActivity.java +++ b/testing/android/java/src/org/chromium/native_test/ChromeNativeTestActivity.java @@ -12,6 +12,7 @@ import android.os.Handler; import android.util.Log; import org.chromium.base.PathUtils; +import org.chromium.base.SystemMonitor; import java.io.File; @@ -40,6 +41,9 @@ public class ChromeNativeTestActivity extends Activity { // Needed by path_utils_unittest.cc PathUtils.setPrivateDataDirectorySuffix("chrome"); + // Needed by system_monitor_unittest.cc + SystemMonitor.createForTests(this); + try { loadLibrary(); Bundle extras = this.getIntent().getExtras(); |