ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_io_data.mm - Issue 1701063002: CookieStore: Remove reference counting.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_io_data.mm

Issue 1701063002: CookieStore: Remove reference counting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@threadsafe

Patch Set: merge Created 4 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_io_data.h ('k') | ios/chrome/browser/ios_chrome_io_thread.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_io_data.mm

diff --git a/ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_io_data.mm b/ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_io_data.mm

index b420e0e83bb73a3ab1b6503a85a74a55c62dd432..26b3d2b2d286d134a2d75c86bfab95a17daabf58 100644

--- a/ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_io_data.mm

+++ b/ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_io_data.mm

@@ -25,6 +25,7 @@

#include "ios/chrome/browser/pref_names.h"

#include "ios/web/public/web_thread.h"

#include "net/base/sdch_manager.h"

+#include "net/cookies/cookie_store.h"

#include "net/disk_cache/disk_cache.h"

#include "net/extras/sqlite/sqlite_channel_id_store.h"

#include "net/ftp/ftp_network_layer.h"

@@ -196,11 +197,12 @@ void OffTheRecordChromeBrowserStateIOData::InitializeInternal(

set_channel_id_service(channel_id_service);

main_context->set_channel_id_service(channel_id_service);

- main_context->set_cookie_store(

+ main_cookie_store_ =

cookie_util::CreateCookieStore(cookie_util::CookieStoreConfig(

cookie_path_,

cookie_util::CookieStoreConfig::RESTORED_SESSION_COOKIES,

- cookie_util::CookieStoreConfig::COOKIE_STORE_IOS, nullptr)));

+ cookie_util::CookieStoreConfig::COOKIE_STORE_IOS, nullptr));

+ main_context->set_cookie_store(main_cookie_store_.get());

http_network_session_ = CreateHttpNetworkSession(*profile_params);

main_http_factory_ = CreateMainHttpFactory(