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

Side by Side Diff: chrome/browser/profiles/profile_impl_io_data.cc

Issue 10174008: Fix up ordering in ProfileIOData. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge Created 8 years, 8 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/profiles/profile_impl_io_data.h" 5 #include "chrome/browser/profiles/profile_impl_io_data.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 238
239 ProfileImplIOData::LazyParams::LazyParams() 239 ProfileImplIOData::LazyParams::LazyParams()
240 : cache_max_size(0), 240 : cache_max_size(0),
241 media_cache_max_size(0) {} 241 media_cache_max_size(0) {}
242 ProfileImplIOData::LazyParams::~LazyParams() {} 242 ProfileImplIOData::LazyParams::~LazyParams() {}
243 243
244 ProfileImplIOData::ProfileImplIOData() 244 ProfileImplIOData::ProfileImplIOData()
245 : ProfileIOData(false), 245 : ProfileIOData(false),
246 clear_local_state_on_exit_(false) {} 246 clear_local_state_on_exit_(false) {}
247 ProfileImplIOData::~ProfileImplIOData() { 247 ProfileImplIOData::~ProfileImplIOData() {
248 DestroyResourceContext();
249
248 if (media_request_context_) 250 if (media_request_context_)
249 media_request_context_->AssertNoURLRequests(); 251 media_request_context_->AssertNoURLRequests();
250 } 252 }
251 253
252 void ProfileImplIOData::LazyInitializeInternal( 254 void ProfileImplIOData::LazyInitializeInternal(
253 ProfileParams* profile_params) const { 255 ProfileParams* profile_params) const {
254 // Keep track of clear_local_state_on_exit for isolated apps. 256 // Keep track of clear_local_state_on_exit for isolated apps.
255 clear_local_state_on_exit_ = profile_params->clear_local_state_on_exit; 257 clear_local_state_on_exit_ = profile_params->clear_local_state_on_exit;
256 258
257 ChromeURLRequestContext* main_context = main_request_context(); 259 ChromeURLRequestContext* main_context = main_request_context();
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
509 void ProfileImplIOData::ClearNetworkingHistorySinceOnIOThread( 511 void ProfileImplIOData::ClearNetworkingHistorySinceOnIOThread(
510 base::Time time) { 512 base::Time time) {
511 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 513 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
512 LazyInitialize(); 514 LazyInitialize();
513 515
514 DCHECK(transport_security_state()); 516 DCHECK(transport_security_state());
515 transport_security_state()->DeleteSince(time); 517 transport_security_state()->DeleteSince(time);
516 DCHECK(http_server_properties_manager()); 518 DCHECK(http_server_properties_manager());
517 http_server_properties_manager()->Clear(); 519 http_server_properties_manager()->Clear();
518 } 520 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_impl_io_data.h ('k') | chrome/browser/profiles/profile_io_data.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698