| Index: chrome/browser/profiles/profile_io_data.h
|
| diff --git a/chrome/browser/profiles/profile_io_data.h b/chrome/browser/profiles/profile_io_data.h
|
| index 32312abf4781300a1f842e307d44db7e2cc068f6..f373eaa0acd0d871917a087d077e67e6676fa8e5 100644
|
| --- a/chrome/browser/profiles/profile_io_data.h
|
| +++ b/chrome/browser/profiles/profile_io_data.h
|
| @@ -88,24 +88,20 @@ class TransportSecurityPersister;
|
| class TransportSecurityState;
|
| class URLRequestJobFactoryImpl;
|
| } // namespace net
|
|
|
| namespace policy {
|
| class PolicyCertVerifier;
|
| class PolicyHeaderIOHelper;
|
| class URLBlacklistManager;
|
| } // namespace policy
|
|
|
| -namespace previews {
|
| -class PreviewsIOData;
|
| -}
|
| -
|
| // Conceptually speaking, the ProfileIOData represents data that lives on the IO
|
| // thread that is owned by a Profile, such as, but not limited to, network
|
| // objects like CookieMonster, HttpTransactionFactory, etc. Profile owns
|
| // ProfileIOData, but will make sure to delete it on the IO thread (except
|
| // possibly in unit tests where there is no IO thread).
|
| class ProfileIOData {
|
| public:
|
| typedef std::vector<scoped_refptr<ChromeURLRequestContextGetter>>
|
| ChromeURLRequestContextGetterVector;
|
|
|
| @@ -250,24 +246,20 @@ class ProfileIOData {
|
| client_cert_store_factory_ = factory;
|
| }
|
|
|
| bool IsDataReductionProxyEnabled() const;
|
|
|
| data_reduction_proxy::DataReductionProxyIOData*
|
| data_reduction_proxy_io_data() const {
|
| return data_reduction_proxy_io_data_.get();
|
| }
|
|
|
| - previews::PreviewsIOData* previews_io_data() const {
|
| - return previews_io_data_.get();
|
| - }
|
| -
|
| // This function is to be used to check if the |url| is defined in
|
| // blacklist or whitelist policy.
|
| virtual policy::URLBlacklist::URLBlacklistState GetURLBlacklistState(
|
| const GURL& url) const;
|
|
|
| // Returns the predictor service for this Profile. Returns nullptr if there is
|
| // no Predictor, as is the case with OffTheRecord profiles.
|
| virtual chrome_browser_net::Predictor* GetPredictor();
|
|
|
| // Get platform ClientCertStore. May return nullptr.
|
| @@ -390,23 +382,20 @@ class ProfileIOData {
|
| // ProfileIOData, and the derived class calls this method to set the
|
| // channel_id_service_ member and transfers ownership to the base
|
| // class.
|
| void set_channel_id_service(
|
| net::ChannelIDService* channel_id_service) const;
|
|
|
| void set_data_reduction_proxy_io_data(
|
| std::unique_ptr<data_reduction_proxy::DataReductionProxyIOData>
|
| data_reduction_proxy_io_data) const;
|
|
|
| - void set_previews_io_data(
|
| - std::unique_ptr<previews::PreviewsIOData> previews_io_data) const;
|
| -
|
| net::ProxyService* proxy_service() const {
|
| return proxy_service_.get();
|
| }
|
|
|
| net::HttpServerProperties* http_server_properties() const;
|
|
|
| void set_http_server_properties(
|
| std::unique_ptr<net::HttpServerProperties> http_server_properties) const;
|
|
|
| net::URLRequestContext* main_request_context() const {
|
| @@ -570,22 +559,20 @@ class ProfileIOData {
|
|
|
| // Pointed to by URLRequestContext.
|
| #if defined(ENABLE_EXTENSIONS)
|
| mutable scoped_refptr<extensions::InfoMap> extension_info_map_;
|
| #endif
|
| mutable std::unique_ptr<net::ChannelIDService> channel_id_service_;
|
|
|
| mutable std::unique_ptr<data_reduction_proxy::DataReductionProxyIOData>
|
| data_reduction_proxy_io_data_;
|
|
|
| - mutable std::unique_ptr<previews::PreviewsIOData> previews_io_data_;
|
| -
|
| mutable std::unique_ptr<net::ProxyService> proxy_service_;
|
| mutable std::unique_ptr<net::TransportSecurityState>
|
| transport_security_state_;
|
| mutable std::unique_ptr<net::CTVerifier> cert_transparency_verifier_;
|
| mutable std::unique_ptr<ChromeExpectCTReporter> expect_ct_reporter_;
|
| mutable std::unique_ptr<net::HttpServerProperties> http_server_properties_;
|
| #if defined(OS_CHROMEOS)
|
| // Set to |cert_verifier_| if it references a PolicyCertVerifier. In that
|
| // case, the verifier is owned by |cert_verifier_|. Otherwise, set to NULL.
|
| mutable std::unique_ptr<net::CertVerifier> cert_verifier_;
|
|
|