Create LoadingDataCollector class and have observers rely on it instead of ResourcePrefetchPredictor

chrome/browser/predictors/loading_test_util.h

Index: chrome/browser/predictors/loading_test_util.h
diff --git a/chrome/browser/predictors/resource_prefetch_predictor_test_util.h b/chrome/browser/predictors/loading_test_util.h
similarity index 68%
rename from chrome/browser/predictors/resource_prefetch_predictor_test_util.h
rename to chrome/browser/predictors/loading_test_util.h
index d11f783fd39bacd28fc88066f5cf6ae4f6c70e0d..5244534f3c9c2a34d854a3cac6762de9aefe47ea 100644
--- a/chrome/browser/predictors/resource_prefetch_predictor_test_util.h
+++ b/chrome/browser/predictors/loading_test_util.h
@@ -1,15 +1,20 @@
 // Copyright 2016 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.
-#ifndef CHROME_BROWSER_PREDICTORS_RESOURCE_PREFETCH_PREDICTOR_TEST_UTIL_H_
-#define CHROME_BROWSER_PREDICTORS_RESOURCE_PREFETCH_PREDICTOR_TEST_UTIL_H_
+#ifndef CHROME_BROWSER_PREDICTORS_LOADING_TEST_UTIL_H_
+#define CHROME_BROWSER_PREDICTORS_LOADING_TEST_UTIL_H_
 
+#include <memory>
 #include <string>
 #include <vector>
 
 #include "chrome/browser/predictors/resource_prefetch_predictor.h"
 #include "chrome/browser/predictors/resource_prefetch_predictor_tables.h"
 #include "components/sessions/core/session_id.h"
+#include "net/url_request/url_request_context.h"
+#include "net/url_request/url_request_job.h"
+#include "net/url_request/url_request_job_factory.h"
+#include "net/url_request/url_request_test_util.h"
 
 namespace predictors {
 
@@ -79,6 +84,74 @@ ResourcePrefetchPredictor::URLRequestSummary CreateURLRequestSummary(
 
 void PopulateTestConfig(LoadingPredictorConfig* config, bool small_db = true);
 
+class EmptyURLRequestDelegate : public net::URLRequest::Delegate {

[Benoit L, 2017/06/07 12:01:05]

nit: Since this is only referred to in the .cc file, can you move it there?

[trevordixon, 2017/06/07 12:37:15]

Done.

+  void OnResponseStarted(net::URLRequest* request, int net_error) override {}
+  void OnReadCompleted(net::URLRequest* request, int bytes_read) override {}
+};
+
+scoped_refptr<net::HttpResponseHeaders> MakeResponseHeaders(
+    const char* headers);
+
+class MockURLRequestJob : public net::URLRequestJob {
+ public:
+  MockURLRequestJob(net::URLRequest* request,
+                    const net::HttpResponseInfo& response_info,
+                    const std::string& mime_type);
+
+  bool GetMimeType(std::string* mime_type) const override;
+
+ protected:
+  void Start() override;
+  void GetResponseInfo(net::HttpResponseInfo* info) override;
+
+ private:
+  net::HttpResponseInfo response_info_;
+  std::string mime_type_;
+};
+
+class MockURLRequestJobFactory : public net::URLRequestJobFactory {
+ public:
+  MockURLRequestJobFactory();
+  ~MockURLRequestJobFactory() override;
+
+  void Reset();
+
+  net::URLRequestJob* MaybeCreateJobWithProtocolHandler(
+      const std::string& scheme,
+      net::URLRequest* request,
+      net::NetworkDelegate* network_delegate) const override;
+
+  net::URLRequestJob* MaybeInterceptRedirect(
+      net::URLRequest* request,
+      net::NetworkDelegate* network_delegate,
+      const GURL& location) const override;
+
+  net::URLRequestJob* MaybeInterceptResponse(
+      net::URLRequest* request,
+      net::NetworkDelegate* network_delegate) const override;
+
+  bool IsHandledProtocol(const std::string& scheme) const override;
+
+  bool IsSafeRedirectTarget(const GURL& location) const override;
+
+  void set_response_info(const net::HttpResponseInfo& response_info) {
+    response_info_ = response_info;
+  }
+
+  void set_mime_type(const std::string& mime_type) { mime_type_ = mime_type; }
+
+ private:
+  net::HttpResponseInfo response_info_;
+  std::string mime_type_;
+};
+
+std::unique_ptr<net::URLRequest> CreateURLRequest(
+    const net::TestURLRequestContext& url_request_context,
+    const GURL& url,
+    net::RequestPriority priority,
+    content::ResourceType resource_type,
+    bool is_main_frame);
+
 // For printing failures nicely.
 std::ostream& operator<<(std::ostream& stream, const PrefetchData& data);
 std::ostream& operator<<(std::ostream& stream, const ResourceData& resource);
@@ -120,4 +193,4 @@ bool operator==(const PrecacheResource& lhs, const PrecacheResource& rhs);
 
 }  // namespace precache
 
-#endif  // CHROME_BROWSER_PREDICTORS_RESOURCE_PREFETCH_PREDICTOR_TEST_UTIL_H_
+#endif  // CHROME_BROWSER_PREDICTORS_LOADING_TEST_UTIL_H_