summaryrefslogtreecommitdiffstats
path: root/net/websockets
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-16 18:56:09 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-16 18:56:09 +0000
commit84a12e448f6e54b2ed026e2b34bb73474e6dcf72 (patch)
tree2d60323b17ef47a7d7d1c7094e7264cbfae44a23 /net/websockets
parentfc160d4b5fe40e5deb3b722fc27dd17a9dc49cd5 (diff)
downloadchromium_src-84a12e448f6e54b2ed026e2b34bb73474e6dcf72.zip
chromium_src-84a12e448f6e54b2ed026e2b34bb73474e6dcf72.tar.gz
chromium_src-84a12e448f6e54b2ed026e2b34bb73474e6dcf72.tar.bz2
Revert 75143 - Reland r74842
The bug was that the ProfilePolicyContext was getting initialized before the ProfileImplIOData::Handle was initialized. BUG=67237 TEST=none Review URL: http://codereview.chromium.org/6526029 TBR=willchan@chromium.org Review URL: http://codereview.chromium.org/6480120 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75152 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/websockets')
-rw-r--r--net/websockets/websocket_job_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/websockets/websocket_job_unittest.cc b/net/websockets/websocket_job_unittest.cc
index 37013b9..2133cfa 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) {
- set_cookie_store(cookie_store);
- set_cookie_policy(cookie_policy);
+ cookie_store_ = cookie_store;
+ cookie_policy_ = cookie_policy;
}
private: