Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(201)

Side by Side Diff: chrome/browser/safe_browsing/safe_browsing_service.cc

Issue 24734007: Encrypt all stored cookies on selected operating systems. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressed (most) review comments by Erik Created 7 years, 2 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/safe_browsing/safe_browsing_service.h" 5 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after
301 net::URLRequestContextGetter* system_url_request_context_getter) { 301 net::URLRequestContextGetter* system_url_request_context_getter) {
302 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 302 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
303 DCHECK(!url_request_context_.get()); 303 DCHECK(!url_request_context_.get());
304 304
305 scoped_refptr<net::CookieStore> cookie_store( 305 scoped_refptr<net::CookieStore> cookie_store(
306 content::CreatePersistentCookieStore( 306 content::CreatePersistentCookieStore(
307 CookieFilePath(), 307 CookieFilePath(),
308 false, 308 false,
309 NULL, 309 NULL,
310 NULL, 310 NULL,
311 scoped_refptr<base::SequencedTaskRunner>())); 311 scoped_refptr<base::SequencedTaskRunner>(),
312 NULL));
312 313
313 url_request_context_.reset(new net::URLRequestContext); 314 url_request_context_.reset(new net::URLRequestContext);
314 // |system_url_request_context_getter| may be NULL during tests. 315 // |system_url_request_context_getter| may be NULL during tests.
315 if (system_url_request_context_getter) { 316 if (system_url_request_context_getter) {
316 url_request_context_->CopyFrom( 317 url_request_context_->CopyFrom(
317 system_url_request_context_getter->GetURLRequestContext()); 318 system_url_request_context_getter->GetURLRequestContext());
318 } 319 }
319 url_request_context_->set_cookie_store(cookie_store.get()); 320 url_request_context_->set_cookie_store(cookie_store.get());
320 } 321 }
321 322
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
481 #if defined(FULL_SAFE_BROWSING) 482 #if defined(FULL_SAFE_BROWSING)
482 if (csd_service_.get()) 483 if (csd_service_.get())
483 csd_service_->SetEnabledAndRefreshState(enable); 484 csd_service_->SetEnabledAndRefreshState(enable);
484 if (download_service_.get()) { 485 if (download_service_.get()) {
485 download_service_->SetEnabled( 486 download_service_->SetEnabled(
486 enable && !CommandLine::ForCurrentProcess()->HasSwitch( 487 enable && !CommandLine::ForCurrentProcess()->HasSwitch(
487 switches::kDisableImprovedDownloadProtection)); 488 switches::kDisableImprovedDownloadProtection));
488 } 489 }
489 #endif 490 #endif
490 } 491 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698