summaryrefslogtreecommitdiffstats
path: root/net/websockets
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-16 19:45:41 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-16 19:45:41 +0000
commitf6c21cb31f1b7bd4e8873a55e9954eece1fddda5 (patch)
tree6430a3c5eff0decfd793e7912e5e5fe7bb04a838 /net/websockets
parent64cd5c20952c3ae6ebb83a9ea3760795f5c5c0dc (diff)
downloadchromium_src-f6c21cb31f1b7bd4e8873a55e9954eece1fddda5.zip
chromium_src-f6c21cb31f1b7bd4e8873a55e9954eece1fddda5.tar.gz
chromium_src-f6c21cb31f1b7bd4e8873a55e9954eece1fddda5.tar.bz2
Reland r74842
Merged correctly this time. BUG=none TEST=none Review URL: http://codereview.chromium.org/6523067 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75165 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 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: