Updated UploadProgress tests under ThreadSanitizer

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 <string>
 
 #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"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
 
 namespace {
 
 const char kPostPath[] = "/post";
 const char kRedirectPostPath[] = "/redirect";
+#if defined(THREAD_SANITIZER)

[mmenke, 2015/09/01 18:37:42]

Think this is worth a comment and a bug link

[Charlie Harrison, 2015/09/01 20:29:57]

Done.

+const size_t kPayloadSize = 9565938; // 2*3^14

[mmenke, 2015/09/01 18:37:42]

Cutting data size by just 1/3rd seems to be cutting things a bit close.  I'd
suggest going with 2*3^12, out of paranoia.

[Charlie Harrison, 2015/09/01 20:29:57]

Done.

+const std::string kPostScript = "WaitForAsyncXHR('/post', 'small');";
+const std::string kRedirectScript = "WaitForAsyncXHR('/redirect', 'small');";

[mmenke, 2015/09/01 18:37:42]

I suggest passing in kPayloadSize instead.

[Charlie Harrison, 2015/09/01 20:29:57]

How do you suggest I do that? Manually via a string or something like sprintf?

[mmenke, 2015/09/01 20:31:39]

base::StringPrintf

+#else
 const size_t kPayloadSize = 28697814;  // 2*3^15
+const std::string kPostScript = "WaitForAsyncXHR('/post', 'large');";
+const std::string kRedirectScript = "WaitForAsyncXHR('/redirect', 'large');";
+#endif
 
 scoped_ptr<net::test_server::HttpResponse> 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, kRedirectPostPath,
                        base::CompareCase::SENSITIVE)) {
     http_response->set_code(net::HTTP_TEMPORARY_REDIRECT);
     http_response->AddCustomHeader("Location", kPostPath);
@@ skipping 17 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(AsyncResourceHandlerBrowserTest, UploadProgress) {
   net::test_server::EmbeddedTestServer* test_server = embedded_test_server();
   ASSERT_TRUE(test_server->InitializeAndWaitUntilReady());
   test_server->RegisterRequestHandler(
       base::Bind(&HandlePostAndRedirectURLs, kPostPath));
 
   NavigateToURL(shell(),
                 test_server->GetURL("/loader/async_resource_handler.html"));
 
+  printf("Navigated To URL...\n");

[mmenke, 2015/09/01 18:37:42]

nit:  Remove printf

[Charlie Harrison, 2015/09/01 20:29:57]

Done. Oops.

   std::string js_result;
   EXPECT_TRUE(ExecuteScriptAndExtractString(
       shell()->web_contents(),
-      "WaitForAsyncXHR('/post')",
+      kPostScript,
       &js_result));
   EXPECT_EQ(js_result, "success");
 }
 
 IN_PROC_BROWSER_TEST_F(AsyncResourceHandlerBrowserTest,
                        UploadProgressRedirect) {
   net::test_server::EmbeddedTestServer* test_server = embedded_test_server();
   ASSERT_TRUE(test_server->InitializeAndWaitUntilReady());
   test_server->RegisterRequestHandler(
       base::Bind(&HandlePostAndRedirectURLs, kRedirectPostPath));
 
   NavigateToURL(shell(),
                 test_server->GetURL("/loader/async_resource_handler.html"));
 
   std::string js_result;
   EXPECT_TRUE(ExecuteScriptAndExtractString(
       shell()->web_contents(),
-      "WaitForAsyncXHR('/redirect')",
+      kRedirectScript,
       &js_result));
   EXPECT_EQ(js_result, "success");
 }
 
 }  // namespace content