Make Cronet's upload test server to serve files

components/cronet/android/test/upload_test_server.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "upload_test_server.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
+#include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/path_service.h"
 #include "base/strings/string_util.h"
 #include "jni/UploadTestServer_jni.h"
 #include "net/http/http_status_code.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/embedded_test_server/http_request.h"
 #include "net/test/embedded_test_server/http_response.h"
 #include "url/gurl.h"
 
 namespace cronet {
 
@@ skipping 56 matching lines @@
 
 }  // namespace
 
 jboolean StartUploadTestServer(JNIEnv* env, jclass jcaller) {
   // Shouldn't happen.
   if (g_test_server)
     return false;
   g_test_server = new net::test_server::EmbeddedTestServer();
   g_test_server->RegisterRequestHandler(
       base::Bind(&UploadServerRequestHandler));
+  base::FilePath test_files_root;
+  PathService::Get(base::DIR_ANDROID_APP_DATA, &test_files_root);
+  g_test_server->ServeFilesFromDirectory(test_files_root);

[mmenke, 2014/12/04 20:29:13]

Think it's worth a comment that this will only handle paths the
UploadServerRequestHandler does not.

[xunjieli, 2014/12/04 20:37:17]

Done.

   return g_test_server->InitializeAndWaitUntilReady();
 }
 
 void ShutdownUploadTestServer(JNIEnv* env, jclass jcaller) {
   if (!g_test_server)
     return;
   delete g_test_server;
   g_test_server = NULL;
 }
 
@@ skipping 24 matching lines @@
   GURL url = g_test_server->GetURL(echo_method_path);
   return base::android::ConvertUTF8ToJavaString(env, url.spec()).Release();
 }
 
 jstring GetRedirectToEchoBody(JNIEnv* env, jclass jcaller) {
   DCHECK(g_test_server);
   GURL url = g_test_server->GetURL(redirect_to_echo_body_path);
   return base::android::ConvertUTF8ToJavaString(env, url.spec()).Release();
 }
 
+jstring GetFileURL(JNIEnv* env, jclass jcaller, jstring jfile_path) {
+  DCHECK(g_test_server);
+  std::string file = base::android::ConvertJavaStringToUTF8(env, jfile_path);
+  GURL url = g_test_server->GetURL(file);
+  return base::android::ConvertUTF8ToJavaString(env, url.spec()).Release();
+}
+
 bool RegisterUploadTestServer(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace cronet