Data Reduction Proxy class ownership updates and Settings cleanup

components/data_reduction_proxy/core/browser/data_reduction_proxy_service.h

Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_service.h
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_service.h b/components/data_reduction_proxy/core/browser/data_reduction_proxy_service.h
new file mode 100644
index 0000000000000000000000000000000000000000..309194c0e7cc4aaa833374e8384fee36a285660e
--- /dev/null
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_service.h
@@ -0,0 +1,101 @@
+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef COMPONENTS_DATA_REDUCTION_PROXY_CORE_BROWSER_DATA_REDUCTION_PROXY_SERVICE_H_
+#define COMPONENTS_DATA_REDUCTION_PROXY_CORE_BROWSER_DATA_REDUCTION_PROXY_SERVICE_H_
+
+#include "base/callback.h"
+#include "base/macros.h"
+#include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
+#include "base/threading/non_thread_safe.h"
+#include "net/url_request/url_fetcher_delegate.h"
+
+class GURL;
+class PrefService;
+
+namespace base {
+class SequencedTaskRunner;
+class TimeDelta;
+}
+
+namespace net {
+class URLFetcher;
+class URLRequestContextGetter;
+class URLRequestStatus;
+}
+
+namespace data_reduction_proxy {
+
+typedef base::Callback<void(const std::string&, const net::URLRequestStatus&)>
+    FetcherResponseCallback;
+
+class DataReductionProxySettings;
+class DataReductionProxyStatisticsPrefs;
+
+class DataReductionProxyService : public base::NonThreadSafe,

[bengr, 2015/02/20 00:00:37]

Class comment.

[jeremyim, 2015/02/20 02:17:17]

Done.

+                                 public net::URLFetcherDelegate {
+ public:
+  // The caller must ensure that |settings| and |request_context| remain alive
+  // for the lifetime of the |DataReductionProxyService| instance. This instance
+  // will take ownership of |statistics_prefs|.
+  // TODO(jeremyim): DataReductionProxyService should own
+  // DataReductionProxySettings and not vice versa.
+  DataReductionProxyService(
+      scoped_ptr<DataReductionProxyStatisticsPrefs> statistics_prefs,
+      DataReductionProxySettings* settings,
+      net::URLRequestContextGetter* request_context);
+  ~DataReductionProxyService() override;

[bengr, 2015/02/20 00:00:37]

Add a blank line above.

[jeremyim, 2015/02/20 02:17:17]

Done.

+
+  void Shutdown();
+
+  // Requests the given |probe_url|. Upon completion, returns the results to the
+  // caller via the |fetcher_callback|. Virtualized for unit testing.
+  virtual void CheckProbeURL(const GURL& probe_url,
+                             FetcherResponseCallback fetcher_callback);
+
+  // Constructs statistics prefs. This should not be called if a valid
+  // statistics prefs is passed into the constructor.
+  void EnableCompressionStatisticsLogging(
+      PrefService* prefs,
+      scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
+      const base::TimeDelta& commit_delay);
+
+  DataReductionProxyStatisticsPrefs* statistics_prefs() const {
+    return statistics_prefs_.get();
+  }
+
+  DataReductionProxySettings* settings() const {
+    return settings_;
+  }
+
+  base::WeakPtr<DataReductionProxyService> GetWeakPtr();
+
+ protected:
+  // Virtualized for testing. Returns a fetcher for the probe to check if OK for
+  // the proxy to use TLS.
+  virtual net::URLFetcher* GetURLFetcherForProbe(const GURL& probe_url);
+
+ private:
+  // net::URLFetcherDelegate:
+  void OnURLFetchComplete(const net::URLFetcher* source) override;
+
+  net::URLRequestContextGetter* url_request_context_getter_;
+
+  // The URLFetcher being used for the canary check.
+  scoped_ptr<net::URLFetcher> fetcher_;
+  FetcherResponseCallback fetcher_callback_;
+
+  // Tracks compression statistics to be displayed to the user.
+  scoped_ptr<DataReductionProxyStatisticsPrefs> statistics_prefs_;
+
+  DataReductionProxySettings* settings_;
+
+  base::WeakPtrFactory<DataReductionProxyService> weak_factory_;
+
+  DISALLOW_COPY_AND_ASSIGN(DataReductionProxyService);
+};
+
+}  // namespace data_reduction_proxy

[bengr, 2015/02/20 00:00:37]

Add a blank line below.

[jeremyim, 2015/02/20 02:17:17]

Done.

+#endif  // COMPONENTS_DATA_REDUCTION_PROXY_CORE_BROWSER_DATA_REDUCTION_PROXY_SERVICE_H_