Downloads: replace BrowserThread::FILE with task scheduler.

content/browser/download/download_item_impl_unittest.cc

 // Copyright (c) 2012 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/download/download_item_impl.h"
 
 #include <stdint.h>
 
 #include <deque>
 #include <iterator>
@@ skipping 17 matching lines @@
 #include "content/browser/download/download_item_impl_delegate.h"
 #include "content/browser/download/download_request_handle.h"
 #include "content/browser/download/mock_download_file.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/download_interrupt_reasons.h"
 #include "content/public/browser/download_url_parameters.h"
 #include "content/public/common/content_features.h"
 #include "content/public/test/mock_download_item.h"
 #include "content/public/test/test_browser_context.h"
 #include "content/public/test/test_browser_thread_bundle.h"
+#include "content/public/test/test_utils.h"
 #include "content/public/test/web_contents_tester.h"
 #include "crypto/secure_hash.h"
 #include "net/http/http_response_headers.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::DoAll;
 using ::testing::Invoke;
 using ::testing::InvokeWithoutArgs;
 using ::testing::NiceMock;
@@ skipping 338 matching lines @@
       item->Cancel(true);
       RunAllPendingInMessageLoops();
     }
   }
 
   // Destroy a previously created download item.
   void DestroyDownloadItem(DownloadItem* item) {
     allocated_downloads_.erase(item);
   }
 
-  void RunAllPendingInMessageLoops() { base::RunLoop().RunUntilIdle(); }
+  void RunAllPendingInMessageLoops() { RunAllBlockingPoolTasksUntilIdle(); }

[gab, 2017/06/21 19:42:24]

inline below instead of having this indirection?

[Sigurður Ásgeirsson, 2017/06/22 14:50:09]

Done.

 
   MockDelegate* mock_delegate() {
     return &delegate_;
   }
 
   void OnDownloadFileAcquired(base::FilePath* return_path,
                               const base::FilePath& path) {
     *return_path = path;
   }
 
@@ skipping 401 matching lines @@
                         Property(&DownloadUrlParameters::offset, 1)),
                   _))
       .Times(DownloadItemImpl::kMaxAutoResumeAttempts);
   for (int i = 0; i < (DownloadItemImpl::kMaxAutoResumeAttempts + 1); ++i) {
     SCOPED_TRACE(::testing::Message() << "Iteration " << i);
 
     mock_download_file = base::MakeUnique<NiceMock<MockDownloadFile>>();
     mock_download_file_ref = mock_download_file.get();
     mock_request_handle = base::MakeUnique<NiceMock<MockRequestHandle>>();
 
+    EXPECT_CALL(*mock_download_file, Initialize(_, _, _, _))
+        .WillOnce(ScheduleCallbackWithParam(DOWNLOAD_INTERRUPT_REASON_NONE));

[gab, 2017/06/21 19:42:24]

Why is this changing?

[Sigurður Ásgeirsson, 2017/06/22 14:50:08]

As-is, the default mock setup fires the callback on-thread. The other places
where this a mock is used, it goes through a factory function that has this, but
that's apparently not applicable here.

... time passes ...

Actually the default behavior in the mock has other fallout, fixing at source.

     ON_CALL(*mock_download_file_ref, FullPath())
         .WillByDefault(ReturnRefOfCopy(base::FilePath()));
 
     // Copied key parts of DoIntermediateRename & CallDownloadItemStart
     // to allow for holding onto the request handle.
     item->Start(std::move(mock_download_file), std::move(mock_request_handle),
                 *create_info());
     RunAllPendingInMessageLoops();
 
     base::FilePath target_path(kDummyTargetPath);
@@ skipping 1519 matching lines @@
 
   item_->Cancel(true);
   RunAllPendingInMessageLoops();
 }
 
 TEST(MockDownloadItem, Compiles) {
   MockDownloadItem mock_item;
 }
 
 }  // namespace content