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

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

Issue 141533006: [Android] Move the java content/ package to content_public/ to start the split. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Small fixes and findbugs line update Created 6 years, 11 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellApplication.java ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 package org.chromium.native_test; 5 package org.chromium.native_test;
6 6
7 import android.app.Activity; 7 import android.app.Activity;
8 import android.content.Context; 8 import android.content.Context;
9 import android.os.Bundle; 9 import android.os.Bundle;
10 import android.os.Handler; 10 import android.os.Handler;
11 import android.util.Log; 11 import android.util.Log;
12 12
13 import org.chromium.base.PathUtils; 13 import org.chromium.base.PathUtils;
14 import org.chromium.base.PowerMonitor; 14 import org.chromium.base.PowerMonitor;
15 // TODO(cjhopman): This should not refer to content. NativeLibraries should be m oved to base. 15 // TODO(cjhopman): This should not refer to content. NativeLibraries should be m oved to base.
16 import org.chromium.content.app.NativeLibraries; 16 import org.chromium.content_public.app.NativeLibraries;
17 17
18 // Android's NativeActivity is mostly useful for pure-native code. 18 // Android's NativeActivity is mostly useful for pure-native code.
19 // Our tests need to go up to our own java classes, which is not possible using 19 // Our tests need to go up to our own java classes, which is not possible using
20 // the native activity class loader. 20 // the native activity class loader.
21 public class ChromeNativeTestActivity extends Activity { 21 public class ChromeNativeTestActivity extends Activity {
22 private static final String TAG = "ChromeNativeTestActivity"; 22 private static final String TAG = "ChromeNativeTestActivity";
23 private static final String EXTRA_RUN_IN_SUB_THREAD = "RunInSubThread"; 23 private static final String EXTRA_RUN_IN_SUB_THREAD = "RunInSubThread";
24 // We post a delayed task to run tests so that we do not block onCreate(). 24 // We post a delayed task to run tests so that we do not block onCreate().
25 private static final long RUN_TESTS_DELAY_IN_MS = 300; 25 private static final long RUN_TESTS_DELAY_IN_MS = 300;
26 26
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 private void loadLibraries() { 70 private void loadLibraries() {
71 for (String library: NativeLibraries.LIBRARIES) { 71 for (String library: NativeLibraries.LIBRARIES) {
72 Log.i(TAG, "loading: " + library); 72 Log.i(TAG, "loading: " + library);
73 System.loadLibrary(library); 73 System.loadLibrary(library);
74 Log.i(TAG, "loaded: " + library); 74 Log.i(TAG, "loaded: " + library);
75 } 75 }
76 } 76 }
77 77
78 private native void nativeRunTests(String filesDir, Context appContext); 78 private native void nativeRunTests(String filesDir, Context appContext);
79 } 79 }
OLDNEW
« no previous file with comments | « content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellApplication.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698