Add GetPostData and ID to headless::Request plus fix GetFrameTreeNodeId

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 18 matching lines @@
 class ResourceRequestInfo;
 }  // namespace content
 
 namespace headless {
 
 class URLRequestDispatcher;
 
 // Wrapper around net::URLRequest with helpers to access select metadata.
 class Request {
  public:
+  virtual uint64_t GetRequestId() const = 0;
+
   virtual const net::URLRequest* GetURLRequest() const = 0;
 
   // The frame from which the request came from.
   virtual int GetFrameTreeNodeId() const = 0;
 
   // The devtools agent host id for the page where the request came from.
   virtual std::string GetDevToolsAgentHostId() const = 0;
 
+  // Gets the POST data, if any, from the net::URLRequest.
+  virtual std::string GetPostData() const = 0;
+
   enum class ResourceType {
     MAIN_FRAME = 0,
     SUB_FRAME = 1,
     STYLESHEET = 2,
     SCRIPT = 3,
     IMAGE = 4,
     FONT_RESOURCE = 5,
     SUB_RESOURCE = 6,
     OBJECT = 7,
     MEDIA = 8,
@@ skipping 114 matching lines @@
   // URLFetcher::FetchResultListener implementation:
   void OnFetchStartError(net::Error error) override;
   void OnFetchComplete(const GURL& final_url,
                        int http_response_code,
                        scoped_refptr<net::HttpResponseHeaders> response_headers,
                        const char* body,
                        size_t body_size) override;
 
  protected:
   // Request implementation:
+  uint64_t GetRequestId() const override;
   const net::URLRequest* GetURLRequest() const override;
   int GetFrameTreeNodeId() const override;
   std::string GetDevToolsAgentHostId() const override;
+  std::string GetPostData() const override;
   ResourceType GetResourceType() const override;
 
   // PendingRequest implementation:
   const Request* GetRequest() const override;
   void AllowRequest() override;
   void BlockRequest(net::Error error) override;
   void ModifyRequest(const GURL& url,
                      const std::string& method,
                      const std::string& post_data,
                      const net::HttpRequestHeaders& request_headers) override;
@@ skipping 14 matching lines @@
   scoped_refptr<net::HttpResponseHeaders> response_headers_;
   scoped_refptr<base::SingleThreadTaskRunner> origin_task_runner_;
   std::unique_ptr<MockResponseData> mock_response_;
   Delegate* delegate_;          // Not owned.
   const content::ResourceRequestInfo* request_resource_info_;  // 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_;
+  const uint64_t request_id_;
+  static uint64_t next_request_id_;
 
   base::WeakPtrFactory<GenericURLRequestJob> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GenericURLRequestJob);
 };
 
 }  // namespace headless
 
 #endif  // HEADLESS_PUBLIC_UTIL_GENERIC_URL_REQUEST_JOB_H_