Implement upload progress handling in Mojo loading

content/browser/loader/async_resource_handler_browsertest.cc

 // 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 <stddef.h>
 #include <string>
 #include <utility>
 
+#include "base/command_line.h"
 #include "base/format_macros.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.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"
@@ skipping 36 matching lines @@
     http_response->set_content_type("text/plain");
     EXPECT_EQ(request.content.length(), kPayloadSize);
     return std::move(http_response);
   } else {
     return std::unique_ptr<net::test_server::HttpResponse>();
   }
 }
 
 }  // namespace
 
-class AsyncResourceHandlerBrowserTest : public ContentBrowserTest {
+class AsyncResourceHandlerBrowserTest
+    : public ContentBrowserTest,
+      public testing::WithParamInterface<bool> {
+  void SetUpCommandLine(base::CommandLine* command_line) override {
+    if (GetParam())
+      command_line->AppendSwitchASCII("--enable-blink-features",
+                                      "LoadingWithMojo");

[mmenke, 2017/01/18 17:00:46]

nit:  Add braces.  (And good job noticing we can now do this!)

[tzik, 2017/01/19 11:53:09]

Done.

+  }
 };
 
-IN_PROC_BROWSER_TEST_F(AsyncResourceHandlerBrowserTest, UploadProgress) {
+IN_PROC_BROWSER_TEST_P(AsyncResourceHandlerBrowserTest, UploadProgress) {
   net::EmbeddedTestServer* test_server = embedded_test_server();
   test_server->RegisterRequestHandler(
       base::Bind(&HandlePostAndRedirectURLs, kPostPath));
   ASSERT_TRUE(test_server->Start());
 
   NavigateToURL(shell(),
                 test_server->GetURL("/loader/async_resource_handler.html"));
 
   std::string js_result;
   EXPECT_TRUE(ExecuteScriptAndExtractString(
       shell(), base::StringPrintf("WaitForAsyncXHR('%s', %" PRIuS ")",
                                   kPostPath, kPayloadSize),
       &js_result));
   EXPECT_EQ(js_result, "success");
 }
 
-IN_PROC_BROWSER_TEST_F(AsyncResourceHandlerBrowserTest,
+IN_PROC_BROWSER_TEST_P(AsyncResourceHandlerBrowserTest,
                        UploadProgressRedirect) {
   net::EmbeddedTestServer* test_server = embedded_test_server();
   test_server->RegisterRequestHandler(
       base::Bind(&HandlePostAndRedirectURLs, kRedirectPostPath));
   ASSERT_TRUE(test_server->Start());
 
   NavigateToURL(shell(),
                 test_server->GetURL("/loader/async_resource_handler.html"));
 
   std::string js_result;
   EXPECT_TRUE(ExecuteScriptAndExtractString(
       shell(), base::StringPrintf("WaitForAsyncXHR('%s', %" PRIuS ")",
                                   kRedirectPostPath, kPayloadSize),
       &js_result));
   EXPECT_EQ(js_result, "success");
 }
 
+INSTANTIATE_TEST_CASE_P(AsyncResourceHandlerBrowserTest,
+                        AsyncResourceHandlerBrowserTest,
+                        ::testing::Values(false, true));
+
 }  // namespace content