Restructure URLRequestSlowDownloadJob to avoid races.

chrome/browser/download/download_browsertest.cc

 // Copyright (c) 2011 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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/path_service.h"
@@ skipping 627 matching lines @@
   }
 
   // Checks that |path| is has |file_size| bytes, and matches the |value|
   // string.
   bool VerifyFile(const FilePath& path,
                   const std::string& value,
                   const int64 file_size) {
     std::string file_contents;
 
     bool read = file_util::ReadFileToString(path, &file_contents);
-
+    EXPECT_TRUE(read) << "Failed reading file: " << path.value() << std::endl;
     if (!read)
       return false;  // Couldn't read the file.
 
     // Note: we don't handle really large files (more than size_t can hold)
     // so we will fail in that case.
     size_t expected_size = static_cast<size_t>(file_size);
 
     // Check the size.
+    EXPECT_EQ(expected_size, file_contents.size());
     if (expected_size != file_contents.size())
       return false;
 
     // Check the contents.
+    EXPECT_EQ(value, file_contents)
+        << "File string comparison mismatch.  Expected: ----\n" << value

[eroman, 2011/11/18 01:54:46]

I believe EXPECT_EQ prints the mismatch, so shouldn't need to explicitly print
value/file_contents.

[Randy Smith (Not in Mondays), 2011/11/18 15:30:18]

Done.

+        << "\n---\nGot:\n----\n" << file_contents << std::endl;
     if (memcmp(file_contents.c_str(), value.c_str(), expected_size) != 0)
       return false;
 
     return true;
   }
 
  private:
   // Location of the test data.
   FilePath test_dir_;
 
@@ skipping 158 matching lines @@
 // The test will first attempt to download a file; but the server will "pause"
 // in the middle until the server receives a second request for
 // "download-finish".  At that time, the download will finish.
 // These tests don't currently test much due to holes in |RunSizeTest()|.  See
 // comments in that routine for details.
 IN_PROC_BROWSER_TEST_F(DownloadTest, UnknownSize) {
   ASSERT_TRUE(RunSizeTest(browser(), SIZE_TEST_TYPE_UNKNOWN,
                           "32.0 KB - ", "100% - "));
 }
 
-#if defined(OS_LINUX)
-// http://crbug.com/104310
-#define KnownSize FLAKY_KnownSize
-#endif
 IN_PROC_BROWSER_TEST_F(DownloadTest, KnownSize) {
   ASSERT_TRUE(RunSizeTest(browser(), SIZE_TEST_TYPE_KNOWN,
                           "71% - ", "100% - "));
 }
 
 // Test that when downloading an item in Incognito mode, we don't crash when
 // closing the last Incognito window (http://crbug.com/13983).
 // Also check that the download shelf is not visible after closing the
 // Incognito window.
 IN_PROC_BROWSER_TEST_F(DownloadTest, IncognitoDownload) {
@@ skipping 822 matching lines @@
   search_results.clear();
 
   manager->SearchDownloads(UTF8ToUTF16("another_file"), &search_results);
   ASSERT_EQ(2u, search_results.size());
   std::sort(search_results.begin(), search_results.end(),
             DownloadItemSorter);
   EXPECT_EQ(2, search_results[0]->db_handle());
   EXPECT_EQ(3, search_results[1]->db_handle());
   search_results.clear();
 }