diff options
author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-14 20:35:15 +0000 |
---|---|---|
committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-14 20:35:15 +0000 |
commit | 182fe2f459b174b9c1de6520776ceb23f7d0f0de (patch) | |
tree | 8d8592387f02940866515447134ed83674b7834e /net/base/cookie_policy.h | |
parent | 6c2f7320e7767f71385134b184c2e0652600b5c0 (diff) | |
download | chromium_src-182fe2f459b174b9c1de6520776ceb23f7d0f0de.zip chromium_src-182fe2f459b174b9c1de6520776ceb23f7d0f0de.tar.gz chromium_src-182fe2f459b174b9c1de6520776ceb23f7d0f0de.tar.bz2 |
Revert 74842 - It seems to have broken the ChromeOS "PFQ bot"?
r74561 added a DCHECK to make sure users didn't try to access the ChromeURLRequestContextGetter from the Profile, since the Profile should only be read on the UI thread. ChromeOS apparently tried to access it from another thread, and therefore hit the new DCHECK.
I'm relanding without the DCHECK. I'm also eagerly initializing the off the record context getter to prevent the ChromeOS race. ChromeOS should fix that code so the eager initialization isn't necessary.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6484041
TBR=willchan@chromium.org
Review URL: http://codereview.chromium.org/6517021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74848 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/cookie_policy.h')
-rw-r--r-- | net/base/cookie_policy.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/base/cookie_policy.h b/net/base/cookie_policy.h index 43b689f..c32c8a9 100644 --- a/net/base/cookie_policy.h +++ b/net/base/cookie_policy.h @@ -21,8 +21,6 @@ enum { class CookiePolicy { public: - virtual ~CookiePolicy() {} - // Determines if the URL's cookies may be read. // // Returns: @@ -59,6 +57,9 @@ class CookiePolicy { const GURL& first_party_for_cookies, const std::string& cookie_line, CompletionCallback* callback) = 0; + + protected: + virtual ~CookiePolicy() {} }; } // namespace net |