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

Unified Diff: chrome/android/shell/chrome_shell_test_entry_point.cc

Issue 1218053003: [Android] Begin switching from lighttpd + apache to EmbeddedTestServer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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
Index: chrome/android/shell/chrome_shell_test_entry_point.cc
diff --git a/chrome/browser/android/chrome_entry_point.cc b/chrome/android/shell/chrome_shell_test_entry_point.cc
similarity index 53%
copy from chrome/browser/android/chrome_entry_point.cc
copy to chrome/android/shell/chrome_shell_test_entry_point.cc
index 4de58eff933427c67a8aba5a1625b29be319c960..e52ab1ce1bf575f97aecf4ea9b393549174f4ed9 100644
--- a/chrome/browser/android/chrome_entry_point.cc
+++ b/chrome/android/shell/chrome_shell_test_entry_point.cc
@@ -3,25 +3,12 @@
// found in the LICENSE file.
#include "base/android/jni_android.h"
-#include "base/bind.h"
-#include "chrome/app/android/chrome_jni_onload.h"
-
-namespace {
-
-bool RegisterJNI(JNIEnv* env) {
- return true;
-}
-
-bool Init() {
- return true;
-}
-
-} // namespace
+#include "net/test/android/net_test_jni_onload.h"
// This is called by the VM when the shared library is first loaded.
JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
- if (!chrome::android::OnJNIOnLoadRegisterJNI(vm, base::Bind(&RegisterJNI)) ||
- !chrome::android::OnJNIOnLoadInit(base::Bind(&Init))) {
+ if (!net::test::OnJNIOnLoadRegisterJNI(vm) ||
+ !net::test::OnJNIOnLoadInit()) {
return -1;
}
return JNI_VERSION_1_4;

Powered by Google App Engine
This is Rietveld 408576698