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

Unified Diff: net/test/embedded_test_server/android/embedded_test_server_android.cc

Issue 2044523003: Revert of 👔 Reland of Move side-loaded test data /sdcard -> /sdcard/gtestdata (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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: net/test/embedded_test_server/android/embedded_test_server_android.cc
diff --git a/net/test/embedded_test_server/android/embedded_test_server_android.cc b/net/test/embedded_test_server/android/embedded_test_server_android.cc
index 3a43e497f6728ba7a9fd38440be7f3376026a5f0..f3f301241e4b31507a39010ce88fe9408f187257 100644
--- a/net/test/embedded_test_server/android/embedded_test_server_android.cc
+++ b/net/test/embedded_test_server/android/embedded_test_server_android.cc
@@ -8,7 +8,6 @@
#include "base/android/scoped_java_ref.h"
#include "base/bind.h"
#include "base/files/file_path.h"
-#include "base/test/test_support_android.h"
#include "base/trace_event/trace_event.h"
#include "net/test/jni/EmbeddedTestServerImpl_jni.h"
@@ -70,13 +69,8 @@
delete this;
}
-static void Init(JNIEnv* env,
- const JavaParamRef<jobject>& jobj,
- const JavaParamRef<jstring>& jtest_data_dir) {
+static void Init(JNIEnv* env, const JavaParamRef<jobject>& jobj) {
TRACE_EVENT0("native", "EmbeddedTestServerAndroid::Init");
- base::FilePath test_data_dir(
- base::android::ConvertJavaStringToUTF8(env, jtest_data_dir));
- base::InitAndroidTestPaths(test_data_dir);
new EmbeddedTestServerAndroid(env, jobj);
}
« no previous file with comments | « net/test/android/javatests/src/org/chromium/net/test/util/CertTestUtil.java ('k') | testing/android/native_test.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698