Use one WebRequestContext per WebView

This change switches from using a pair of WebRequestContexts (one for
private browsing, one for regular browsing) to using one
WebRequestContext per WebView. This is required to allow us to set the
userAgent on each WebView.

The WebRequestContext is now owned by the WebView.

Bug: 3113804
Change-Id: Iba2b1490e7ce4ff65c08a04a310963fa2c7e4f83

1 files changed, 4 insertions, 3 deletions

diff --git a/WebKit/android/WebCoreSupport/WebRequest.h b/WebKit/android/WebCoreSupport/WebRequest.h
index fb756ab..c78546c 100644
--- a/WebKit/android/WebCoreSupport/WebRequest.h
+++ b/WebKit/android/WebCoreSupport/WebRequest.h
@@ -27,7 +27,7 @@
 #define WebRequest_h
 
 #include "ChromiumIncludes.h"
-#include "wtf/Vector.h"
+#include <wtf/Vector.h>
 
 class MessageLoop;
 
@@ -44,8 +44,9 @@ enum LoadState {
 };
 
 class UrlInterceptResponse;
-class WebResourceRequest;
 class WebFrame;
+class WebRequestContext;
+class WebResourceRequest;
 class WebUrlLoaderClient;
 
 // All methods in this class must be called on the io thread
@@ -65,7 +66,7 @@ public:
     void appendBytesToUpload(Vector<char>* data);
     void appendFileToUpload(const std::string& filename);
 
-    void start(bool isPrivateBrowsing);
+    void start(WebRequestContext*);
     void cancel();
 
     // From URLRequest::Delegate