| Index: chrome/browser/profiles/profile_impl_io_data.cc
|
| diff --git a/chrome/browser/profiles/profile_impl_io_data.cc b/chrome/browser/profiles/profile_impl_io_data.cc
|
| index ca00a8056d4480cee697099222fa8a72d564c546..02a1b32174470a16b16b38bab3ea0d3626211050 100644
|
| --- a/chrome/browser/profiles/profile_impl_io_data.cc
|
| +++ b/chrome/browser/profiles/profile_impl_io_data.cc
|
| @@ -22,11 +22,11 @@
|
| #include "chrome/browser/io_thread.h"
|
| #include "chrome/browser/net/chrome_net_log.h"
|
| #include "chrome/browser/net/chrome_network_delegate.h"
|
| +#include "chrome/browser/net/chrome_special_storage_policy_delegate.h"
|
| #include "chrome/browser/net/connect_interceptor.h"
|
| #include "chrome/browser/net/cookie_store_util.h"
|
| #include "chrome/browser/net/http_server_properties_manager_factory.h"
|
| #include "chrome/browser/net/predictor.h"
|
| -#include "chrome/browser/net/sqlite_server_bound_cert_store.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/common/chrome_constants.h"
|
| #include "chrome/common/chrome_switches.h"
|
| @@ -46,6 +46,7 @@
|
| #include "net/ftp/ftp_network_layer.h"
|
| #include "net/http/http_cache.h"
|
| #include "net/http/http_server_properties_manager.h"
|
| +#include "net/sqlite/sqlite_server_bound_cert_store.h"
|
| #include "net/ssl/server_bound_cert_service.h"
|
| #include "net/url_request/url_request_job_factory_impl.h"
|
| #include "webkit/browser/quota/special_storage_policy.h"
|
| @@ -441,12 +442,14 @@ void ProfileImplIOData::InitializeInternal(
|
| if (!server_bound_cert_service) {
|
| DCHECK(!lazy_params_->server_bound_cert_path.empty());
|
|
|
| - scoped_refptr<SQLiteServerBoundCertStore> server_bound_cert_db =
|
| - new SQLiteServerBoundCertStore(
|
| + scoped_refptr<net::SQLiteServerBoundCertStore> server_bound_cert_db =
|
| + new net::SQLiteServerBoundCertStore(
|
| lazy_params_->server_bound_cert_path,
|
| BrowserThread::GetBlockingPool()->GetSequencedTaskRunner(
|
| BrowserThread::GetBlockingPool()->GetSequenceToken()),
|
| - lazy_params_->special_storage_policy.get());
|
| + scoped_ptr<net::SpecialStoragePolicyDelegate>(
|
| + new ChromeSpecialStoragePolicyDelegate(
|
| + lazy_params_->special_storage_policy.get())).Pass());
|
| server_bound_cert_service = new net::ServerBoundCertService(
|
| new net::DefaultServerBoundCertStore(server_bound_cert_db.get()),
|
| base::WorkerPool::GetTaskRunner(true));
|
|
|