Moved data reduction proxy initialization logic to ProfileImplIOData

components/data_reduction_proxy/browser/data_reduction_proxy_params.h

 // Copyright 2014 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_BROWSER_DATA_REDUCTION_PROXY_PARAMS_H_
 #define COMPONENTS_DATA_REDUCTION_PROXY_BROWSER_DATA_REDUCTION_PROXY_PARAMS_H_
 
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 62 matching lines @@
   // |kfallbackAllowed| a fallback proxy can be used if the primary proxy is
   // bypassed or disabled. If |kAlternativeAllowed| then an alternative proxy
   // configuration is allowed to be used. This alternative configuration would
   // replace the primary and fallback proxy configurations if enabled. Finally
   // if |kPromoAllowed|, the client may show a promotion for the data reduction
   // proxy.
   //
   // A standard configuration has a primary proxy, and a fallback proxy for
   // HTTP traffic. The alternative configuration has a different primary and
   // fallback proxy for HTTP traffic, and an SSL proxy.
+  explicit DataReductionProxyParams(int flags);
 
-  DataReductionProxyParams(int flags);
+  // Creates a copy of the configuration parameters.
+  DataReductionProxyParams* Clone();

[willchan no longer on Chromium, 2014/07/31 22:31:35]

Return scoped_ptr<DataReductionProxyParams>. This self-documents that it's
transferring ownership.

[bengr, 2014/08/02 01:10:32]

Done.

 
   virtual ~DataReductionProxyParams();
 
   // Returns true if a data reduction proxy was used for the given |request|.
   // If true, |proxy_servers.first| will contain the name of the proxy that was
   // used. |proxy_servers.second| will contain the name of the data reduction
   // proxy server that would be used if |proxy_server.first| is bypassed, if one
   // exists. |proxy_servers| can be NULL if the caller isn't interested in its
   // values.
   virtual bool WasDataReductionProxyUsed(
@@ skipping 105 matching lines @@
   // Returns true if any proxy origins are set on the command line.
   bool is_configured_on_command_line() const {
     return configured_on_command_line_;
   }
 
  protected:
   // Test constructor that optionally won't call Init();
   DataReductionProxyParams(int flags,
                            bool should_call_init);
 
+  DataReductionProxyParams(const DataReductionProxyParams& params);
+
   // Initialize the values of the proxies, and probe URL, from command
   // line flags and preprocessor constants, and check that there are
   // corresponding definitions for the allowed configurations.
   bool Init(bool allowed, bool fallback_allowed, bool alt_allowed);
 
   // Initialize the values of the proxies, and probe URL from command
   // line flags and preprocessor constants.
   void InitWithoutChecks();
 
   // Returns the corresponding string from preprocessor constants if defined,
@@ skipping 24 matching lines @@
   GURL alt_fallback_origin_;
   GURL probe_url_;
   GURL warmup_url_;
 
   bool allowed_;
   const bool fallback_allowed_;
   bool alt_allowed_;
   const bool promo_allowed_;
   bool holdback_;
 
   bool configured_on_command_line_;

[willchan no longer on Chromium, 2014/07/31 22:31:35]

Please declare a private operator=. I don't think you need to define it since it
should never be called. But I think if you don't do this, the compiler will
generate a public one.

[bengr, 2014/08/02 01:10:32]

Done.

-
-  DISALLOW_COPY_AND_ASSIGN(DataReductionProxyParams);
 };
 
 }  // namespace data_reduction_proxy
 #endif  // COMPONENTS_DATA_REDUCTION_PROXY_BROWSER_DATA_REDUCTION_PROXY_PARAMS_H_