Add Network.setSendRequestIdHeader and use it in headless

headless/public/util/generic_url_request_job.h

 // 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 HEADLESS_PUBLIC_UTIL_GENERIC_URL_REQUEST_JOB_H_
 #define HEADLESS_PUBLIC_UTIL_GENERIC_URL_REQUEST_JOB_H_
 
 #include <stddef.h>
 #include <functional>
 #include <memory>
@@ skipping 40 matching lines @@
     size_t response_data_size;
   };
 
   class Delegate {
    public:
     // Allows the delegate to rewrite the URL for a given request. Return true
     // to signal that the rewrite is in progress and |callback| will be called
     // with the result, or false to indicate that no rewriting is necessary.
     // Called on an arbitrary thread.
     virtual bool BlockOrRewriteRequest(const GURL& url,
+                                       const std::string& devtools_id,
                                        const std::string& method,
                                        const std::string& referrer,
-                                       RewriteCallback callback) = 0;
+                                       RewriteCallback callback);
+    // TODO(alexclarke): Make the above pure virtual and remove this.
+    virtual bool BlockOrRewriteRequest(const GURL& url,
+                                       const std::string& method,
+                                       const std::string& referrer,
+                                       RewriteCallback callback);
 
     // Allows the delegate to synchronously fulfill a request with a reply.
     // Called on an arbitrary thread.
     virtual const HttpResponse* MaybeMatchResource(
         const GURL& url,
+        const std::string& devtools_id,
         const std::string& method,
-        const net::HttpRequestHeaders& request_headers) = 0;
+        const net::HttpRequestHeaders& request_headers);
+    // TODO(alexclarke): Make the above pure virtual and remove this.
+    virtual const HttpResponse* MaybeMatchResource(
+        const GURL& url,
+        const std::string& method,
+        const net::HttpRequestHeaders& request_headers);
 
     // Signals that a resource load has finished. Called on an arbitrary thread.
     virtual void OnResourceLoadComplete(const GURL& final_url,
+                                        const std::string& devtools_id,
                                         const std::string& mime_type,
-                                        int http_response_code) = 0;
+                                        int http_response_code);
+    // TODO(alexclarke): Make the above pure virtual and remove this.
+    virtual void OnResourceLoadComplete(const GURL& final_url,
+                                        const std::string& mime_type,
+                                        int http_response_code) {}
 
    protected:
     virtual ~Delegate() {}
   };
 
   // NOTE |url_request_dispatcher| and |delegate| must outlive the
   // GenericURLRequestJob.
   GenericURLRequestJob(net::URLRequest* request,
                        net::NetworkDelegate* network_delegate,
                        URLRequestDispatcher* url_request_dispatcher,
@@ skipping 24 matching lines @@
                       const std::string& method,
                       const url::Origin& site_for_cookies);
 
   void OnCookiesAvailable(const GURL& rewritten_url,
                           const std::string& method,
                           const net::CookieList& cookie_list);
 
   std::unique_ptr<URLFetcher> url_fetcher_;
   net::HttpRequestHeaders extra_request_headers_;
   scoped_refptr<net::HttpResponseHeaders> response_headers_;
+  std::string devtools_request_id_;
   Delegate* delegate_;          // Not owned.
   const char* body_ = nullptr;  // Not owned.
   int http_response_code_ = 0;
   size_t body_size_ = 0;
   size_t read_offset_ = 0;
   base::TimeTicks response_time_;
 
   base::WeakPtrFactory<GenericURLRequestJob> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GenericURLRequestJob);
 };
 
 }  // namespace headless
 
 #endif  // HEADLESS_PUBLIC_UTIL_GENERIC_URL_REQUEST_JOB_H_