| OLD | NEW |
| 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 <set> | 7 #include <set> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 379 io_data_->http_server_properties_manager_ = | 379 io_data_->http_server_properties_manager_ = |
| 380 chrome_browser_net::HttpServerPropertiesManagerFactory::CreateManager( | 380 chrome_browser_net::HttpServerPropertiesManagerFactory::CreateManager( |
| 381 pref_service); | 381 pref_service); |
| 382 io_data_->set_http_server_properties( | 382 io_data_->set_http_server_properties( |
| 383 scoped_ptr<net::HttpServerProperties>( | 383 scoped_ptr<net::HttpServerProperties>( |
| 384 io_data_->http_server_properties_manager_)); | 384 io_data_->http_server_properties_manager_)); |
| 385 io_data_->session_startup_pref()->Init( | 385 io_data_->session_startup_pref()->Init( |
| 386 prefs::kRestoreOnStartup, pref_service); | 386 prefs::kRestoreOnStartup, pref_service); |
| 387 io_data_->session_startup_pref()->MoveToThread( | 387 io_data_->session_startup_pref()->MoveToThread( |
| 388 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); | 388 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); |
| 389 #if defined(SAFE_BROWSING_SERVICE) | |
| 390 io_data_->safe_browsing_enabled()->Init(prefs::kSafeBrowsingEnabled, | 389 io_data_->safe_browsing_enabled()->Init(prefs::kSafeBrowsingEnabled, |
| 391 pref_service); | 390 pref_service); |
| 392 io_data_->safe_browsing_enabled()->MoveToThread( | 391 io_data_->safe_browsing_enabled()->MoveToThread( |
| 393 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); | 392 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); |
| 394 #endif | |
| 395 io_data_->InitializeOnUIThread(profile_); | 393 io_data_->InitializeOnUIThread(profile_); |
| 396 } | 394 } |
| 397 | 395 |
| 398 scoped_ptr<ProfileIOData::ChromeURLRequestContextGetterVector> | 396 scoped_ptr<ProfileIOData::ChromeURLRequestContextGetterVector> |
| 399 ProfileImplIOData::Handle::GetAllContextGetters() { | 397 ProfileImplIOData::Handle::GetAllContextGetters() { |
| 400 ChromeURLRequestContextGetterMap::iterator iter; | 398 ChromeURLRequestContextGetterMap::iterator iter; |
| 401 scoped_ptr<ChromeURLRequestContextGetterVector> context_getters( | 399 scoped_ptr<ChromeURLRequestContextGetterVector> context_getters( |
| 402 new ChromeURLRequestContextGetterVector()); | 400 new ChromeURLRequestContextGetterVector()); |
| 403 | 401 |
| 404 iter = isolated_media_request_context_getter_map_.begin(); | 402 iter = isolated_media_request_context_getter_map_.begin(); |
| (...skipping 406 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 811 const base::Closure& completion) { | 809 const base::Closure& completion) { |
| 812 DCHECK_CURRENTLY_ON(BrowserThread::IO); | 810 DCHECK_CURRENTLY_ON(BrowserThread::IO); |
| 813 DCHECK(initialized()); | 811 DCHECK(initialized()); |
| 814 | 812 |
| 815 DCHECK(transport_security_state()); | 813 DCHECK(transport_security_state()); |
| 816 // Completes synchronously. | 814 // Completes synchronously. |
| 817 transport_security_state()->DeleteAllDynamicDataSince(time); | 815 transport_security_state()->DeleteAllDynamicDataSince(time); |
| 818 DCHECK(http_server_properties_manager_); | 816 DCHECK(http_server_properties_manager_); |
| 819 http_server_properties_manager_->Clear(completion); | 817 http_server_properties_manager_->Clear(completion); |
| 820 } | 818 } |
| OLD | NEW |