Headless (breaking change): A better GenericURLRequestJob::Delegate API

headless/public/util/testing/generic_url_request_mocks.cc

Index: headless/public/util/testing/generic_url_request_mocks.cc
diff --git a/headless/public/util/testing/generic_url_request_mocks.cc b/headless/public/util/testing/generic_url_request_mocks.cc
index 3d5e6825be494f5772442cd669e941a2903c9650..42863d73c50df1efee40c6e83a904d2953a3265b 100644
--- a/headless/public/util/testing/generic_url_request_mocks.cc
+++ b/headless/public/util/testing/generic_url_request_mocks.cc
@@ -15,45 +15,43 @@ namespace headless {
 
 // MockGenericURLRequestJobDelegate
 MockGenericURLRequestJobDelegate::MockGenericURLRequestJobDelegate()
-    : should_block_(false),
-      main_thread_task_runner_(base::ThreadTaskRunnerHandle::Get()) {}
+    : main_thread_task_runner_(base::ThreadTaskRunnerHandle::Get()) {}
+
 MockGenericURLRequestJobDelegate::~MockGenericURLRequestJobDelegate() {}
 
-bool MockGenericURLRequestJobDelegate::BlockOrRewriteRequest(
-    const GURL& url,
-    const std::string& devtools_id,
-    const std::string& method,
-    const std::string& referrer,
-    GenericURLRequestJob::RewriteCallback callback) {
-  if (should_block_) {
-    // Simulate the client acknowledging the callback from a different thread.
-    main_thread_task_runner_->PostTask(
-        FROM_HERE, base::Bind(
-                       [](GenericURLRequestJob::RewriteCallback callback,
-                          std::string method) {
-                         callback.Run(
-                             GenericURLRequestJob::RewriteResult::kDeny, GURL(),
-                             method);
-                       },
-                       callback, method));
-  }
-  return should_block_;
+// GenericURLRequestJob::Delegate methods:
+void MockGenericURLRequestJobDelegate::OnIncomingRequest(
+    IncomingRequest* incoming_request) {
+  // Simulate the client acknowledging the callback from a different thread.
+  main_thread_task_runner_->PostTask(
+      FROM_HERE, base::Bind(&MockGenericURLRequestJobDelegate::ApplyPolicy,
+                            base::Unretained(this), incoming_request));
 }
 
-const GenericURLRequestJob::HttpResponse*
-MockGenericURLRequestJobDelegate::MaybeMatchResource(
-    const GURL& url,
-    const std::string& devtools_id,
-    const std::string& method,
-    const net::HttpRequestHeaders& request_headers) {
-  return nullptr;
+void MockGenericURLRequestJobDelegate::SetPolicy(Policy policy) {
+  policy_ = policy;
 }
 
+void MockGenericURLRequestJobDelegate::ApplyPolicy(
+    IncomingRequest* incoming_request) {
+  if (policy_.is_null()) {
+    incoming_request->AllowRequest();
+  } else {
+    policy_.Run(incoming_request);
+  }
+}
+
+void MockGenericURLRequestJobDelegate::OnResourceLoadFailed(
+    const Request* request,
+    net::Error error) {}
+
 void MockGenericURLRequestJobDelegate::OnResourceLoadComplete(
+    const Request* request,
     const GURL& final_url,
-    const std::string& devtools_id,
-    const std::string& mime_type,
-    int http_response_code) {}
+    int http_response_code,
+    scoped_refptr<net::HttpResponseHeaders> response_headers,
+    const char* body,
+    size_t body_size) {}
 
 // MockCookieStore
 MockCookieStore::MockCookieStore() {}