Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(473)

Unified Diff: testing/android/java/src/org/chromium/native_test/ChromeNativeTestActivity.java

Issue 11027024: Android: Integrates native and java SystemMonitor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Initialize java side for tests. Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/system_monitor/system_monitor_android.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: testing/android/java/src/org/chromium/native_test/ChromeNativeTestActivity.java
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 b984c4868a79155bb9f18ac0f21396033ac8da6b..77022506daa6b5ea930f6d9a5741840bcfadeb68 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
Satish 2012/10/08 13:58:10 Since this is required only by 1 test, it is overh
bulach 2012/10/08 14:01:04 thanks! that's correct, there are no alternatives,
+ SystemMonitor.createForTests(this);
+
try {
loadLibrary();
Bundle extras = this.getIntent().getExtras();
« no previous file with comments | « base/system_monitor/system_monitor_android.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698