Android: Integrates native and java SystemMonitor.

testing/android/java/src/org/chromium/native_test/ChromeNativeTestActivity.java

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 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.PathUtils;
+import org.chromium.base.SystemMonitor;
 
 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 Activity {
     private final String TAG = "ChromeNativeTestActivity";
     private final String EXTRA_RUN_IN_SUB_THREAD = "RunInSubThread";
     // We post a delayed task to run tests so that we do not block onCreate().
     private static long RUN_TESTS_DELAY_IN_MS = 300;
 
     // Name of our shlib as obtained from a string resource.
     private String mLibrary;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         mLibrary = getResources().getString(R.string.native_library);
         if ((mLibrary == null) || mLibrary.startsWith("replace")) {
             nativeTestFailed();
             return;
         }
 
         // 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 overhead for all the other tests..
but because it is a c++ test I guess there is no alternative other than putting
it in common code here.

[bulach, 2012/10/08 14:01:04]

thanks! that's correct, there are no alternatives, as the c++ test requires this
to be set up by the application / harness... note though that the overhead is
insignificant, as this is run per test suite, not per test..

+        SystemMonitor.createForTests(this);
+
         try {
             loadLibrary();
             Bundle extras = this.getIntent().getExtras();
             if (extras != null && extras.containsKey(EXTRA_RUN_IN_SUB_THREAD)) {
                 // Create a new thread and run tests on it.
                 new Thread() {
                     @Override
                     public void run() {
                         runTests();
                     }
@@ skipping 28 matching lines @@
     }
 
     private void loadLibrary() throws UnsatisfiedLinkError {
         Log.i(TAG, "loading: " + mLibrary);
         System.loadLibrary(mLibrary);
         Log.i(TAG, "loaded: " + mLibrary);
     }
 
     private native void nativeRunTests(String filesDir, Context appContext);
 }