Revert of Add a NetworkQualityEstimator to TestURLRequestContext.

content/browser/android/url_request_content_job_unittest.cc

 // Copyright 2014 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/android/url_request_content_job.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <memory>
 
 #include "base/files/file_util.h"
-#include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/test_file_util.h"
-#include "base/threading/thread_task_runner_handle.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 
 namespace content {
 
 namespace {
 
 // A URLRequestJobFactory that will return URLRequestContentJobWithCallbacks
 // instances for content:// scheme URLs.
 class CallbacksJobFactory : public net::URLRequestJobFactory {
  public:
   class JobObserver {
    public:
     virtual ~JobObserver() {}
     virtual void OnJobCreated() = 0;
   };
 
   CallbacksJobFactory(const base::FilePath& path, JobObserver* observer)
       : path_(path), observer_(observer) {
   }
 
   ~CallbacksJobFactory() override {}
 
   net::URLRequestJob* MaybeCreateJobWithProtocolHandler(
       const std::string& scheme,
       net::URLRequest* request,
       net::NetworkDelegate* network_delegate) const override {
-    URLRequestContentJob* job = new URLRequestContentJob(
-        request, network_delegate, path_, base::ThreadTaskRunnerHandle::Get());
+    URLRequestContentJob* job =
+        new URLRequestContentJob(
+            request,
+            network_delegate,
+            path_,
+            const_cast<base::MessageLoop*>(&message_loop_)->task_runner());
     observer_->OnJobCreated();
     return job;
   }
 
   net::URLRequestJob* MaybeInterceptRedirect(
       net::URLRequest* request,
       net::NetworkDelegate* network_delegate,
       const GURL& location) const override {
     return nullptr;
   }
@@ skipping 10 matching lines @@
 
   bool IsHandledURL(const GURL& url) const override {
     return IsHandledProtocol(url.scheme());
   }
 
   bool IsSafeRedirectTarget(const GURL& location) const override {
     return false;
   }
 
  private:
+  base::MessageLoop message_loop_;
   base::FilePath path_;
   JobObserver* observer_;
 };
 
 class JobObserverImpl : public CallbacksJobFactory::JobObserver {
  public:
   JobObserverImpl() : num_jobs_created_(0) {}
   ~JobObserverImpl() override {}
 
   void OnJobCreated() override { ++num_jobs_created_; }
@@ skipping 22 matching lines @@
   URLRequestContentJobTest();
 
  protected:
   // This inserts an image file into the android MediaStore and retrieves the
   // content URI. Then creates and runs a URLRequestContentJob to get the
   // contents out of it. If a Range is provided, this function will add the
   // appropriate Range http header to the request and verify the bytes
   // retrieved.
   void RunRequest(const Range* range);
 
-  base::MessageLoop message_loop_;
   JobObserverImpl observer_;
   net::TestURLRequestContext context_;
   net::TestDelegate delegate_;
 };
 
 URLRequestContentJobTest::URLRequestContentJobTest() {}
 
 void URLRequestContentJobTest::RunRequest(const Range* range) {
   base::FilePath test_dir;
   PathService::Get(base::DIR_SOURCE_ROOT, &test_dir);
@@ skipping 58 matching lines @@
 }
 
 TEST_F(URLRequestContentJobTest, ContentURIWithZeroRange) {
   Range range(0, 0);
   RunRequest(&range);
 }
 
 }  // namespace
 
 }  // namespace content