Updated UploadProgress tests under ThreadSanitizer

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
index 0f438485272543fee61fd9b8b6c08897f8284d9a..7c0fdba235862df2d75d39449da5d50ca1ac2d70 100644
--- a/content/browser/loader/async_resource_handler_browsertest.cc
+++ b/content/browser/loader/async_resource_handler_browsertest.cc
@@ -23,7 +23,15 @@ 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,
@@ -61,10 +69,11 @@ IN_PROC_BROWSER_TEST_F(AsyncResourceHandlerBrowserTest, UploadProgress) {
   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");
 }
@@ -82,7 +91,7 @@ IN_PROC_BROWSER_TEST_F(AsyncResourceHandlerBrowserTest,
   std::string js_result;
   EXPECT_TRUE(ExecuteScriptAndExtractString(
       shell()->web_contents(),
-      "WaitForAsyncXHR('/redirect')",
+      kRedirectScript,
       &js_result));
   EXPECT_EQ(js_result, "success");
 }