summaryrefslogtreecommitdiffstats
path: root/net/websockets
diff options
context:
space:
mode:
authoroshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-12 03:57:44 +0000
committeroshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-12 03:57:44 +0000
commit543a0683e2878c88760d3aace0ebf6fe498082bc (patch)
treee0bca0cf5e7db75c82c241f60f6fb15a6625d536 /net/websockets
parentf275bb18362be416decc58033f36dcd1988217e8 (diff)
downloadchromium_src-543a0683e2878c88760d3aace0ebf6fe498082bc.zip
chromium_src-543a0683e2878c88760d3aace0ebf6fe498082bc.tar.gz
chromium_src-543a0683e2878c88760d3aace0ebf6fe498082bc.tar.bz2
Revert r74632 "Reland r74561 after fixing ChromeOS build breakage."
This reverts commit f19e6d524e086ed8182a475680e931a9a870d2a8. TBR=willchan@chromium.org BUG=none TEST=chromeos pfq bot should cycle green Review URL: http://codereview.chromium.org/6512009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74728 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: