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

Side by Side Diff: components/cronet/android/test/upload_test_server.cc

Issue 873593006: [Cronet] Rename UploadTestServer.java to NativeTestServer.java (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 5 years, 10 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
« no previous file with comments | « components/cronet/android/test/upload_test_server.h ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "upload_test_server.h" 5 #include "upload_test_server.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_string.h" 8 #include "base/android/jni_string.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"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/path_service.h" 12 #include "base/path_service.h"
13 #include "base/strings/string_util.h" 13 #include "base/strings/string_util.h"
14 #include "jni/UploadTestServer_jni.h" 14 #include "jni/NativeTestServer_jni.h"
15 #include "net/http/http_status_code.h" 15 #include "net/http/http_status_code.h"
16 #include "net/test/embedded_test_server/embedded_test_server.h" 16 #include "net/test/embedded_test_server/embedded_test_server.h"
17 #include "net/test/embedded_test_server/http_request.h" 17 #include "net/test/embedded_test_server/http_request.h"
18 #include "net/test/embedded_test_server/http_response.h" 18 #include "net/test/embedded_test_server/http_response.h"
19 #include "url/gurl.h" 19 #include "url/gurl.h"
20 20
21 namespace cronet { 21 namespace cronet {
22 22
23 namespace { 23 namespace {
24 24
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 response->AddCustomHeader("Location", echo_body_path); 72 response->AddCustomHeader("Location", echo_body_path);
73 return response.Pass(); 73 return response.Pass();
74 } 74 }
75 75
76 // Unhandled requests result in the Embedded test server sending a 404. 76 // Unhandled requests result in the Embedded test server sending a 404.
77 return scoped_ptr<net::test_server::BasicHttpResponse>(); 77 return scoped_ptr<net::test_server::BasicHttpResponse>();
78 } 78 }
79 79
80 } // namespace 80 } // namespace
81 81
82 jboolean StartUploadTestServer(JNIEnv* env, 82 jboolean StartNativeTestServer(JNIEnv* env,
83 jclass jcaller, 83 jclass jcaller,
84 jstring jtest_files_root) { 84 jstring jtest_files_root) {
85 // Shouldn't happen. 85 // Shouldn't happen.
86 if (g_test_server) 86 if (g_test_server)
87 return false; 87 return false;
88 g_test_server = new net::test_server::EmbeddedTestServer(); 88 g_test_server = new net::test_server::EmbeddedTestServer();
89 g_test_server->RegisterRequestHandler( 89 g_test_server->RegisterRequestHandler(
90 base::Bind(&UploadServerRequestHandler)); 90 base::Bind(&UploadServerRequestHandler));
91 // Add a second handler for paths that UploadServerRequestHandler does not 91 // Add a second handler for paths that UploadServerRequestHandler does not
92 // handle. 92 // handle.
93 base::FilePath test_files_root( 93 base::FilePath test_files_root(
94 base::android::ConvertJavaStringToUTF8(env, jtest_files_root)); 94 base::android::ConvertJavaStringToUTF8(env, jtest_files_root));
95 g_test_server->ServeFilesFromDirectory(test_files_root); 95 g_test_server->ServeFilesFromDirectory(test_files_root);
96 return g_test_server->InitializeAndWaitUntilReady(); 96 return g_test_server->InitializeAndWaitUntilReady();
97 } 97 }
98 98
99 void ShutdownUploadTestServer(JNIEnv* env, jclass jcaller) { 99 void ShutdownNativeTestServer(JNIEnv* env, jclass jcaller) {
100 if (!g_test_server) 100 if (!g_test_server)
101 return; 101 return;
102 delete g_test_server; 102 delete g_test_server;
103 g_test_server = NULL; 103 g_test_server = NULL;
104 } 104 }
105 105
106 jstring GetEchoBodyURL(JNIEnv* env, jclass jcaller) { 106 jstring GetEchoBodyURL(JNIEnv* env, jclass jcaller) {
107 DCHECK(g_test_server); 107 DCHECK(g_test_server);
108 GURL url = g_test_server->GetURL(echo_body_path); 108 GURL url = g_test_server->GetURL(echo_body_path);
109 return base::android::ConvertUTF8ToJavaString(env, url.spec()).Release(); 109 return base::android::ConvertUTF8ToJavaString(env, url.spec()).Release();
(...skipping 27 matching lines...) Expand all
137 return base::android::ConvertUTF8ToJavaString(env, url.spec()).Release(); 137 return base::android::ConvertUTF8ToJavaString(env, url.spec()).Release();
138 } 138 }
139 139
140 jstring GetFileURL(JNIEnv* env, jclass jcaller, jstring jfile_path) { 140 jstring GetFileURL(JNIEnv* env, jclass jcaller, jstring jfile_path) {
141 DCHECK(g_test_server); 141 DCHECK(g_test_server);
142 std::string file = base::android::ConvertJavaStringToUTF8(env, jfile_path); 142 std::string file = base::android::ConvertJavaStringToUTF8(env, jfile_path);
143 GURL url = g_test_server->GetURL(file); 143 GURL url = g_test_server->GetURL(file);
144 return base::android::ConvertUTF8ToJavaString(env, url.spec()).Release(); 144 return base::android::ConvertUTF8ToJavaString(env, url.spec()).Release();
145 } 145 }
146 146
147 bool RegisterUploadTestServer(JNIEnv* env) { 147 bool RegisterNativeTestServer(JNIEnv* env) {
148 return RegisterNativesImpl(env); 148 return RegisterNativesImpl(env);
149 } 149 }
150 150
151 } // namespace cronet 151 } // namespace cronet
OLDNEW
« no previous file with comments | « components/cronet/android/test/upload_test_server.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698