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/format_macros.h"
 #include "base/strings/string_util.h"
+#include "base/strings/stringprintf.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";
+
+// ThreadSanitizer is too slow to perform the full upload, so tests
+// using that build get an easier test which might not show two distinct
+// progress events. See crbug.com/526985.
+#if defined(THREAD_SANITIZER)
+const size_t kPayloadSize = 1062882;  // 2*3^12
+#else
 const size_t kPayloadSize = 28697814;  // 2*3^15
+#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 20 matching lines @@
   ASSERT_TRUE(test_server->InitializeAndWaitUntilReady());
   test_server->RegisterRequestHandler(
       base::Bind(&HandlePostAndRedirectURLs, kPostPath));
 
   NavigateToURL(shell(),
                 test_server->GetURL("/loader/async_resource_handler.html"));
 
   std::string js_result;
   EXPECT_TRUE(ExecuteScriptAndExtractString(
       shell()->web_contents(),
-      "WaitForAsyncXHR('/post')",
+      base::StringPrintf("WaitForAsyncXHR('%s', %" PRIuS ")",
+                         kPostPath,
+                         kPayloadSize),
       &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')",
+      base::StringPrintf("WaitForAsyncXHR('%s', %" PRIuS ")",
+                         kRedirectPostPath,
+                         kPayloadSize),
       &js_result));
   EXPECT_EQ(js_result, "success");
 }
 
 }  // namespace content