1 files changed, 7 insertions, 10 deletions
diff --git a/WebKit/android/WebCoreSupport/WebRequestContext.h b/WebKit/android/WebCoreSupport/WebRequestContext.h
index ba7dc4f..024308e 100644
--- a/WebKit/android/WebCoreSupport/WebRequestContext.h
+++ b/WebKit/android/WebCoreSupport/WebRequestContext.h
@@ -33,16 +33,12 @@
 
 namespace android {
 
-class WebRequestContext : public URLRequestContext, net::CookiePolicy {
+class WebRequestContext : public URLRequestContext {
 public:
     // URLRequestContext overrides.
     virtual const std::string& GetUserAgent(const GURL&) const;
     virtual const std::string& GetAcceptLanguage() const;
 
-    // CookiePolicy implementation.
-    virtual int CanGetCookies(const GURL& url, const GURL& first_party_for_cookies, net::CompletionCallback*);
-    virtual int CanSetCookie(const GURL& url, const GURL& first_party_for_cookies, const std::string& cookie_line, net::CompletionCallback*);
-
     // Lazily create the relevant context. This class holds a reference.
     // This may be called on any thread. The context returned, however, is not
     // threadsafe, and should only be used on a single thread (the network stack
@@ -53,19 +49,20 @@ public:
     static bool cleanupPrivateBrowsingFiles();
     static void setUserAgent(WTF::String);
     static void setAcceptLanguage(WTF::String);
-    bool allowCookies();
-    void setAllowCookies(bool allow);
+
+    // A helper function used by the cache and cookie managers. Should probably
+    // find a better home, but wait for the refactoring in b/3113804 to be
+    // completed.
+    static void removeFileOrDirectory(const char* filename);
 
 private:
     WebRequestContext();
     ~WebRequestContext();
 
-    static WebRequestContext* getContextForPath(const char* cookieFilename, const char* cacheFilename);
+    static WebRequestContext* getImpl(bool isPrivateBrowsing);
     static WebRequestContext* getRegularContext();
     static WebRequestContext* getPrivateBrowsingContext();
 
-    bool m_allowCookies;
-    WTF::Mutex m_allowCookiesMutex;
 };
 
 } // namespace android