moved upload progress logic from ResourceLoader to AsyncResourceHandler

content/browser/loader/async_resource_handler_browsertest.cc

Index: content/browser/loader/async_resource_handler_browsertest.cc
diff --git a/content/browser/loader/async_resource_handler_browsertest.cc b/content/browser/loader/async_resource_handler_browsertest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..98d533994d628105f34e0421ebf6facd6d14dd46
--- /dev/null
+++ b/content/browser/loader/async_resource_handler_browsertest.cc
@@ -0,0 +1,95 @@
+// Copyright 2015 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 "content/browser/loader/async_resource_handler.h"
+
+#include "base/strings/string_util.h"
+#include "content/public/common/content_switches.h"
+#include "content/public/test/browser_test_utils.h"
+#include "content/public/test/content_browser_test.h"
+#include "content/public/test/content_browser_test_utils.h"
+#include "content/shell/browser/shell.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"
+
+namespace content {
+
+namespace {

[mmenke, 2015/08/27 17:21:29]

nit:  Blank line after start and before end of namespaces.

+const char kPost[] = "/post";
+const char kRedirect[] = "/redirect";

[mmenke, 2015/08/27 17:21:29]

Maybe  kPostPath / kRedirectPostPath?  We post to both paths, afterall

+
+scoped_ptr<net::test_server::HttpResponse> SimplePost(

[mmenke, 2015/08/27 17:21:29]

include net/test/embedded_test_server/http_response.h

[mmenke, 2015/08/27 17:21:29]

include base/memory/scoped_ptr.h

[mmenke, 2015/08/27 17:21:29]

Do we even need this method?  SimplePostRedirect works whenever this does as
well.  It also checks payload size, as an added bonus.

+  const std::string& path,

[mmenke, 2015/08/27 17:21:29]

include string.h

+  const net::test_server::HttpRequest& request) {

[mmenke, 2015/08/27 17:21:29]

net/test/embedded_test_server/http_request.h

+  scoped_ptr<net::test_server::BasicHttpResponse> http_response(
+      new net::test_server::BasicHttpResponse());
+  http_response->set_content("hello");
+  http_response->set_content_type("text/plain");
+  return http_response.Pass();
+}
+
+const size_t payload_size = 28697814; // 2*3^15

[mmenke, 2015/08/27 17:21:29]

nit:  Two spaces between code and comments.

[mmenke, 2015/08/27 17:21:29]

kPayloadSize

+scoped_ptr<net::test_server::HttpResponse> SimplePostRedirect(

[mmenke, 2015/08/27 17:21:29]

HandlePostAndRedirectURLs?

+  const std::string& request_path,
+  const net::test_server::HttpRequest& request) {
+  scoped_ptr<net::test_server::BasicHttpResponse> http_response(
+      new net::test_server::BasicHttpResponse());
+  if (base::StartsWith(request.relative_url, kRedirect,
+                       base::CompareCase::SENSITIVE)) {
+    http_response->set_code(net::HTTP_TEMPORARY_REDIRECT);
+    http_response->AddCustomHeader("Location", kPost);
+    EXPECT_EQ(request.content.length(), payload_size);;

[mmenke, 2015/08/27 17:21:29]

Should explicitly include gtest.h

+    return http_response.Pass();
+  } else if(base::StartsWith(request.relative_url, kPost,
+                             base::CompareCase::SENSITIVE)) {
+    http_response->set_content("hello");
+    http_response->set_content_type("text/plain");
+    EXPECT_EQ(request.content.length(), payload_size);
+    return http_response.Pass();
+  } else {
+    return scoped_ptr<net::test_server::HttpResponse>();
+  }
+}
+}  // namespace

[mmenke, 2015/08/27 17:21:29]

nit:  Blank line after start and before end of namespaces.

+
+class AsyncResourceHandlerBrowserTest : public ContentBrowserTest {
+};
+
+IN_PROC_BROWSER_TEST_F(AsyncResourceHandlerBrowserTest, UploadProgress) {
+  net::test_server::EmbeddedTestServer *test_server = embedded_test_server();

[mmenke, 2015/08/27 17:21:29]

* should be before the space.

+  ASSERT_TRUE(test_server->InitializeAndWaitUntilReady());
+  test_server->RegisterRequestHandler(
+      base::Bind(&SimplePost, kPost));
+
+  NavigateToURL(shell(),
+                test_server->GetURL("/loader/async_resource_handler.html"));
+
+  bool js_result = false;
+  EXPECT_TRUE(ExecuteScriptAndExtractBool(
+      shell()->web_contents(),
+      "WaitForAsyncXHR('/post')",
+      &js_result));
+  EXPECT_TRUE(js_result);
+}
+
+IN_PROC_BROWSER_TEST_F(AsyncResourceHandlerBrowserTest,
+                       UploadProgressRedirect) {
+  net::test_server::EmbeddedTestServer *test_server = embedded_test_server();

[mmenke, 2015/08/27 17:21:29]

* should be before the space.

+  ASSERT_TRUE(test_server->InitializeAndWaitUntilReady());
+  test_server->RegisterRequestHandler(
+      base::Bind(&SimplePostRedirect, kRedirect));
+
+  NavigateToURL(shell(),
+                test_server->GetURL("/loader/async_resource_handler.html"));
+
+  bool js_result = false;
+  EXPECT_TRUE(ExecuteScriptAndExtractBool(
+      shell()->web_contents(),
+      "WaitForAsyncXHR('/redirect')",
+      &js_result));
+  EXPECT_TRUE(js_result);
+}
+
+} // namespace content