Reduce/Remove URLRequest dependencies from AppCacheRequestHandler

content/browser/appcache/appcache_resource_request.h

Index: content/browser/appcache/appcache_resource_request.h
diff --git a/content/browser/appcache/appcache_resource_request.h b/content/browser/appcache/appcache_resource_request.h
new file mode 100644
index 0000000000000000000000000000000000000000..b90279bc4a6fa6a2f3d020ca91ecbf13d5f3e6f7
--- /dev/null
+++ b/content/browser/appcache/appcache_resource_request.h
@@ -0,0 +1,49 @@
+// Copyright (c) 2017 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 CONTENT_BROWSER_APPCACHE_APPCACHE_RESOURCE_REQUEST_H_
+#define CONTENT_BROWSER_APPCACHE_APPCACHE_RESOURCE_REQUEST_H_
+
+#include "content/browser/appcache/appcache_request.h"
+#include "content/common/resource_request.h"
+
+namespace content {
+
+// AppCacheRequest wrapper for the ResourceRequest class.
+class CONTENT_EXPORT AppCacheResourceRequest : public AppCacheRequest {
+ public:
+  // Factory function to create an instance of the AppCacheResourceRequest
+  // class.
+  static AppCacheResourceRequest* Create(const ResourceRequest& request);
+
+  // AppCacheRequest overrides.
+  const GURL& GetURL() const override;
+  const std::string& GetMethod() const override;
+  const GURL& GetFirstPartyForCookies() const override;
+  const GURL GetReferrer() const override;
+  // TODO(ananta)
+  // ResourceRequest only identifies the request unlike URLRequest which
+  // contains response information as well. We need the following methods to
+  // work for AppCache. Look into this.
+  bool IsSuccess() const override;
+  bool IsCancelled() const override;
+  bool IsError() const override;
+  int GetResponseCode() const override;
+  std::string GetResponseHeaderByName(const std::string& name) const override;
+
+  const ResourceRequest* GetResourceRequest() const override;
+
+ protected:
+  AppCacheResourceRequest(const ResourceRequest& request);
+  virtual ~AppCacheResourceRequest();
+
+ private:
+  ResourceRequest request_;

[michaeln, 2017/05/01 23:41:31]

Wait a sec, I think the 'handler' relies on request_.url() updating to reflect
the current url when following a change of redirects.

  // The original url is the url used to initialize the request, and it may
  // differ from the url if the request was redirected.
  const GURL& original_url() const { return url_chain_.front(); }
  // The chain of urls traversed by this request.  If the request had no
  // redirects, this vector will contain one element.
  const std::vector<GURL>& url_chain() const { return url_chain_; }
  const GURL& url() const { return url_chain_.back(); }

We'll need to do something to update the value returned by GetURL for each
successive call to MaybeLoadResource while walking down a redirect chain. Maybe
this class can maintain the url_chain_ outside of the ResourceRequest struct.

[ananta, 2017/05/03 00:16:47]

Sure. I was planning to do that in a later patchset while adding more
functionality to this class

+
+  DISALLOW_COPY_AND_ASSIGN(AppCacheResourceRequest);
+};
+
+}  // namespace content
+
+#endif  // CONTENT_BROWSER_APPCACHE_APPCACHE_RESOURCE_REQUEST_H_