| Index: chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h
|
| diff --git a/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h b/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h
|
| index b3f1bdfd617e755abd046e71c4c03ac3f409a52b..4f3b283e240054cc23c08e37112de938a07091d0 100644
|
| --- a/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h
|
| +++ b/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h
|
| @@ -5,24 +5,21 @@
|
| #ifndef CHROME_BROWSER_NET_SPDYPROXY_DATA_REDUCTION_PROXY_CHROME_SETTINGS_H_
|
| #define CHROME_BROWSER_NET_SPDYPROXY_DATA_REDUCTION_PROXY_CHROME_SETTINGS_H_
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_request_options.h"
|
| #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.h"
|
| #include "components/keyed_service/core/keyed_service.h"
|
|
|
| -namespace base {
|
| class PrefService;
|
| +
|
| +namespace base {
|
| +class SingleThreadTaskRunner;
|
| }
|
|
|
| namespace data_reduction_proxy {
|
| -class DataReductionProxyConfigurator;
|
| class DataReductionProxyIOData;
|
| -class DataReductionProxyEventStore;
|
| -class DataReductionProxyParams;
|
| }
|
|
|
| namespace net {
|
| -class NetLog;
|
| class URLRequestContextGetter;
|
| }
|
|
|
| @@ -34,23 +31,23 @@ class DataReductionProxyChromeSettings
|
| : public data_reduction_proxy::DataReductionProxySettings,
|
| public KeyedService {
|
| public:
|
| - // Constructs a settings object with the given configuration parameters.
|
| - // Construction and destruction must happen on the UI thread.
|
| - explicit DataReductionProxyChromeSettings(
|
| - scoped_ptr<data_reduction_proxy::DataReductionProxyParams> params);
|
| + // Constructs a settings object. Construction and destruction must happen on
|
| + // the UI thread.
|
| + DataReductionProxyChromeSettings();
|
|
|
| // Destructs the settings object.
|
| ~DataReductionProxyChromeSettings() override;
|
|
|
| - // Initialize the settings object with the given configurator, prefs services,
|
| - // and request context. Settings takes ownership of statistics prefs from
|
| - // |io_data|.
|
| + // Overrides KeyedService::Shutdown:
|
| + void Shutdown() override;
|
| +
|
| + // Initialize the settings object with the given io_data, prefs services,
|
| + // request context getter, and task runner.
|
| void InitDataReductionProxySettings(
|
| data_reduction_proxy::DataReductionProxyIOData* io_data,
|
| PrefService* profile_prefs,
|
| - PrefService* local_state_prefs,
|
| - net::URLRequestContextGetter* request_context,
|
| - bool enable_quic);
|
| + net::URLRequestContextGetter* request_context_getter,
|
| + const scoped_refptr<base::SingleThreadTaskRunner>& ui_task_runner);
|
|
|
| // Gets the client type for the data reduction proxy.
|
| static data_reduction_proxy::Client GetClient();
|
|
|