diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-11 18:24:21 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-11 18:24:21 +0000 |
| commit | fba87b5c6d4181c147455078c44f80d39f262b2f (patch) | |
| tree | 4be75b3046cb5ef6fa0a1f6479639996df0565f0 /net/websockets | |
| parent | c59d845257c5245a476ffd4284c506ef58fe008d (diff) | |
| download | chromium_src-fba87b5c6d4181c147455078c44f80d39f262b2f.zip chromium_src-fba87b5c6d4181c147455078c44f80d39f262b2f.tar.gz chromium_src-fba87b5c6d4181c147455078c44f80d39f262b2f.tar.bz2 | |
Reland r74561 after fixing ChromeOS build breakage.
Introduce OffTheRecordProfileIOData and ProfileImplIOData.
They both inherit from ProfileIOData. The former is for the off the record (incognito) profile. The latter is for the normal ProfileImpl profile.
All of the IO related Profile objects are now initialized at the same time, in the subtype implementations of ProfileIOData::LazyInitializeInternal().
I also took this opportunity to clean URLRequestContext up so it is a class and keeps its member variables private. This required touching a fair number of files.
TODO: Remove lots of the refcounting of member variables, since they can now be owned by ProfileIOData.
BUG=67237
TEST=none
Review URL: http://codereview.chromium.org/6500002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74632 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: |