Update to Chromium revision 139606.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@658 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2012-05-31 15:19:33 +00:00
parent dbe75b1326
commit 38f216a9c2
29 changed files with 114 additions and 765 deletions

View File

@@ -302,7 +302,8 @@ void CefURLRequestContextGetter::SetCookieStoragePath(const FilePath& path) {
base::ThreadRestrictions::ScopedAllowIO allow_io;
if (file_util::CreateDirectory(path)) {
const FilePath& cookie_path = path.AppendASCII("Cookies");
persistent_store = new SQLitePersistentCookieStore(cookie_path, false);
persistent_store =
new SQLitePersistentCookieStore(cookie_path, false, NULL);
} else {
NOTREACHED() << "The cookie storage directory could not be created";
}
@@ -321,5 +322,6 @@ void CefURLRequestContextGetter::CreateProxyConfigService() {
return;
proxy_config_service_.reset(
net::ProxyService::CreateSystemProxyConfigService(io_loop_, file_loop_));
net::ProxyService::CreateSystemProxyConfigService(
io_loop_->message_loop_proxy(), file_loop_));
}