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_io_data.h" | 5 #include "chrome/browser/profiles/profile_io_data.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
51 #include "chrome/common/chrome_paths.h" | 51 #include "chrome/common/chrome_paths.h" |
52 #include "chrome/common/chrome_switches.h" | 52 #include "chrome/common/chrome_switches.h" |
53 #include "chrome/common/pref_names.h" | 53 #include "chrome/common/pref_names.h" |
54 #include "chrome/common/url_constants.h" | 54 #include "chrome/common/url_constants.h" |
55 #include "components/content_settings/core/browser/content_settings_provider.h" | 55 #include "components/content_settings/core/browser/content_settings_provider.h" |
56 #include "components/content_settings/core/browser/cookie_settings.h" | 56 #include "components/content_settings/core/browser/cookie_settings.h" |
57 #include "components/content_settings/core/browser/host_content_settings_map.h" | 57 #include "components/content_settings/core/browser/host_content_settings_map.h" |
58 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_d
ata.h" | 58 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_d
ata.h" |
59 #include "components/dom_distiller/core/url_constants.h" | 59 #include "components/dom_distiller/core/url_constants.h" |
60 #include "components/sync_driver/pref_names.h" | 60 #include "components/sync_driver/pref_names.h" |
61 #include "components/url_fixer/url_fixer.h" | 61 #include "components/url_formatter/url_fixer.h" |
62 #include "content/public/browser/browser_thread.h" | 62 #include "content/public/browser/browser_thread.h" |
63 #include "content/public/browser/host_zoom_map.h" | 63 #include "content/public/browser/host_zoom_map.h" |
64 #include "content/public/browser/notification_service.h" | 64 #include "content/public/browser/notification_service.h" |
65 #include "content/public/browser/resource_context.h" | 65 #include "content/public/browser/resource_context.h" |
66 #include "net/base/keygen_handler.h" | 66 #include "net/base/keygen_handler.h" |
67 #include "net/cert/cert_verifier.h" | 67 #include "net/cert/cert_verifier.h" |
68 #include "net/cookies/canonical_cookie.h" | 68 #include "net/cookies/canonical_cookie.h" |
69 #include "net/http/http_transaction_factory.h" | 69 #include "net/http/http_transaction_factory.h" |
70 #include "net/http/http_util.h" | 70 #include "net/http/http_util.h" |
71 #include "net/http/transport_security_persister.h" | 71 #include "net/http/transport_security_persister.h" |
(...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
504 cert_verifier_ = verifier.Pass(); | 504 cert_verifier_ = verifier.Pass(); |
505 #endif | 505 #endif |
506 // The URLBlacklistManager has to be created on the UI thread to register | 506 // The URLBlacklistManager has to be created on the UI thread to register |
507 // observers of |pref_service|, and it also has to clean up on | 507 // observers of |pref_service|, and it also has to clean up on |
508 // ShutdownOnUIThread to release these observers on the right thread. | 508 // ShutdownOnUIThread to release these observers on the right thread. |
509 // Don't pass it in |profile_params_| to make sure it is correctly cleaned up, | 509 // Don't pass it in |profile_params_| to make sure it is correctly cleaned up, |
510 // in particular when this ProfileIOData isn't |initialized_| during deletion. | 510 // in particular when this ProfileIOData isn't |initialized_| during deletion. |
511 #if defined(ENABLE_CONFIGURATION_POLICY) | 511 #if defined(ENABLE_CONFIGURATION_POLICY) |
512 policy::URLBlacklist::SegmentURLCallback callback = | 512 policy::URLBlacklist::SegmentURLCallback callback = |
513 static_cast<policy::URLBlacklist::SegmentURLCallback>( | 513 static_cast<policy::URLBlacklist::SegmentURLCallback>( |
514 url_fixer::SegmentURL); | 514 url_formatter::SegmentURL); |
515 base::SequencedWorkerPool* pool = BrowserThread::GetBlockingPool(); | 515 base::SequencedWorkerPool* pool = BrowserThread::GetBlockingPool(); |
516 scoped_refptr<base::SequencedTaskRunner> background_task_runner = | 516 scoped_refptr<base::SequencedTaskRunner> background_task_runner = |
517 pool->GetSequencedTaskRunner(pool->GetSequenceToken()); | 517 pool->GetSequencedTaskRunner(pool->GetSequenceToken()); |
518 url_blacklist_manager_.reset(new policy::URLBlacklistManager( | 518 url_blacklist_manager_.reset(new policy::URLBlacklistManager( |
519 pref_service, background_task_runner, io_task_runner, callback, | 519 pref_service, background_task_runner, io_task_runner, callback, |
520 base::Bind(policy::OverrideBlacklistForURL))); | 520 base::Bind(policy::OverrideBlacklistForURL))); |
521 | 521 |
522 if (!IsOffTheRecord()) { | 522 if (!IsOffTheRecord()) { |
523 // Add policy headers for non-incognito requests. | 523 // Add policy headers for non-incognito requests. |
524 policy::PolicyHeaderService* policy_header_service = | 524 policy::PolicyHeaderService* policy_header_service = |
(...skipping 804 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1329 new DevToolsNetworkTransactionFactory( | 1329 new DevToolsNetworkTransactionFactory( |
1330 network_controller_.get(), shared_session), | 1330 network_controller_.get(), shared_session), |
1331 shared_session->net_log(), backend)); | 1331 shared_session->net_log(), backend)); |
1332 } | 1332 } |
1333 | 1333 |
1334 void ProfileIOData::SetCookieSettingsForTesting( | 1334 void ProfileIOData::SetCookieSettingsForTesting( |
1335 content_settings::CookieSettings* cookie_settings) { | 1335 content_settings::CookieSettings* cookie_settings) { |
1336 DCHECK(!cookie_settings_.get()); | 1336 DCHECK(!cookie_settings_.get()); |
1337 cookie_settings_ = cookie_settings; | 1337 cookie_settings_ = cookie_settings; |
1338 } | 1338 } |
OLD | NEW |