OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 #include "net/test/embedded_test_server/android/embedded_test_server_android.h" | 5 #include "net/test/embedded_test_server/android/embedded_test_server_android.h" |
6 | 6 |
7 #include "base/android/jni_string.h" | 7 #include "base/android/jni_string.h" |
8 #include "base/android/scoped_java_ref.h" | 8 #include "base/android/scoped_java_ref.h" |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
50 jstring jdirectory_path) { | 50 jstring jdirectory_path) { |
51 const base::FilePath directory( | 51 const base::FilePath directory( |
52 base::android::ConvertJavaStringToUTF8(env, jdirectory_path)); | 52 base::android::ConvertJavaStringToUTF8(env, jdirectory_path)); |
53 test_server_.ServeFilesFromDirectory(directory); | 53 test_server_.ServeFilesFromDirectory(directory); |
54 } | 54 } |
55 | 55 |
56 void EmbeddedTestServerAndroid::Destroy(JNIEnv* env, jobject jobj) { | 56 void EmbeddedTestServerAndroid::Destroy(JNIEnv* env, jobject jobj) { |
57 delete this; | 57 delete this; |
58 } | 58 } |
59 | 59 |
60 static void Init(JNIEnv* env, jobject jobj) { | 60 static void Init(JNIEnv* env, const JavaParamRef<jobject>& jobj) { |
61 TRACE_EVENT0("native", "EmbeddedTestServerAndroid::Init"); | 61 TRACE_EVENT0("native", "EmbeddedTestServerAndroid::Init"); |
62 new EmbeddedTestServerAndroid(env, jobj); | 62 new EmbeddedTestServerAndroid(env, jobj); |
63 } | 63 } |
64 | 64 |
65 // static | 65 // static |
66 bool EmbeddedTestServerAndroid::RegisterEmbeddedTestServerAndroid(JNIEnv* env) { | 66 bool EmbeddedTestServerAndroid::RegisterEmbeddedTestServerAndroid(JNIEnv* env) { |
67 return RegisterNativesImpl(env); | 67 return RegisterNativesImpl(env); |
68 } | 68 } |
69 | 69 |
70 } // namespace test_server | 70 } // namespace test_server |
71 } // namespace net | 71 } // namespace net |
OLD | NEW |