Fix a pair of Cronet upload bugs and add tests.

components/cronet/android/test/upload_test_server.cc

Index: components/cronet/android/test/upload_test_server.cc
diff --git a/components/cronet/android/test/upload_test_server.cc b/components/cronet/android/test/upload_test_server.cc
new file mode 100644
index 0000000000000000000000000000000000000000..1c7b8c8910082eeb2ed438ed567e27833398b3ce
--- /dev/null
+++ b/components/cronet/android/test/upload_test_server.cc
@@ -0,0 +1,123 @@
+// 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/memory/scoped_ptr.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 {
+
+namespace {
+
+const char echo_body_path[] = "/echo_body";
+const char echo_header_path[] = "/echo_header";
+const char echo_method_path[] = "/echo_method";
+const char redirect_to_echo_body_path[] = "/redirect_to_echo_body";
+
+net::test_server::EmbeddedTestServer* g_test_server = nullptr;
+
+scoped_ptr<net::test_server::HttpResponse> UploadServerRequestHandler(
+    const net::test_server::HttpRequest& request) {
+  DCHECK(g_test_server);
+  scoped_ptr<net::test_server::BasicHttpResponse> response(
+      new net::test_server::BasicHttpResponse());
+  response->set_content_type("text/plain");
+
+  if (request.relative_url == echo_body_path) {
+    if (request.has_content) {
+      response->set_content(request.content);
+    } else {
+      response->set_content("Request has no body. :(");
+    }
+    return response.Pass();
+  }
+
+  if (StartsWithASCII(request.relative_url, echo_header_path, true)) {
+    GURL url = g_test_server->GetURL(request.relative_url);
+    auto it = request.headers.find(url.query());
+    if (it != request.headers.end()) {
+      response->set_content(it->second);
+    } else {
+      response->set_content("Header not found. :(");
+    }
+    return response.Pass();
+  }
+
+  if (request.relative_url == echo_method_path) {
+    response->set_content(request.method_string);
+    return response.Pass();
+  }
+
+  if (request.relative_url == redirect_to_echo_body_path) {
+    response->set_code(net::HTTP_TEMPORARY_REDIRECT);
+    response->AddCustomHeader("Location", echo_body_path);
+    return response.Pass();
+  }
+
+  // Unhandled requests result in the Embedded test server sending a 404.
+  return scoped_ptr<net::test_server::BasicHttpResponse>();
+}
+
+}  // 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));
+  return g_test_server->InitializeAndWaitUntilReady();
+}
+
+void ShutdownUploadTestServer(JNIEnv* env, jclass jcaller) {
+  if (!g_test_server)
+    return;
+  delete g_test_server;
+  g_test_server = NULL;
+}
+
+jstring GetEchoBodyURL(JNIEnv* env, jclass jcaller) {
+  DCHECK(g_test_server);
+  GURL url = g_test_server->GetURL(echo_body_path);
+  return base::android::ConvertUTF8ToJavaString(env, url.spec()).Release();
+}
+
+jstring GetEchoHeaderURL(JNIEnv* env, jclass jcaller, jstring jheader) {
+  DCHECK(g_test_server);
+  GURL url = g_test_server->GetURL(echo_header_path);
+  GURL::Replacements replacements;
+  std::string header = base::android::ConvertJavaStringToUTF8(env, jheader);
+  replacements.SetQueryStr(header.c_str());
+  url = url.ReplaceComponents(replacements);
+  return base::android::ConvertUTF8ToJavaString(env, url.spec()).Release();
+}
+
+jstring GetEchoMethodURL(JNIEnv* env, jclass jcaller) {
+  DCHECK(g_test_server);
+  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();
+}
+
+bool RegisterUploadTestServer(JNIEnv* env) {
+  return RegisterNativesImpl(env);
+}
+
+}  // namespace cronet