diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-14 19:43:39 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-14 19:43:39 +0000 |
| commit | a8940f59fdf059ea999792c2782d1c899c95a46f (patch) | |
| tree | 93edc70dff18a7b367ff7825f7a38575721ea3e3 /net/websockets | |
| parent | 0ef39f07d91f7bff93712f95823e5b4738e6ada1 (diff) | |
| download | chromium_src-a8940f59fdf059ea999792c2782d1c899c95a46f.zip chromium_src-a8940f59fdf059ea999792c2782d1c899c95a46f.tar.gz chromium_src-a8940f59fdf059ea999792c2782d1c899c95a46f.tar.bz2 | |
Revert r74728 which reverted r74561 for exposing a ChromeOS bug.
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74842 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/websockets')
| -rw-r--r-- | net/websockets/websocket_job_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/websockets/websocket_job_unittest.cc b/net/websockets/websocket_job_unittest.cc index 2133cfa..37013b9 100644 --- a/net/websockets/websocket_job_unittest.cc +++ b/net/websockets/websocket_job_unittest.cc @@ -181,8 +181,8 @@ class MockURLRequestContext : public URLRequestContext { public: MockURLRequestContext(CookieStore* cookie_store, CookiePolicy* cookie_policy) { - cookie_store_ = cookie_store; - cookie_policy_ = cookie_policy; + set_cookie_store(cookie_store); + set_cookie_policy(cookie_policy); } private: |