Data Reduction Proxy: Remove duplicate functions

components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.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_CORE_BROWSER_DATA_REDUCTION_PROXY_SETTINGS_H_
 #define COMPONENTS_DATA_REDUCTION_PROXY_CORE_BROWSER_DATA_REDUCTION_PROXY_SETTINGS_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/threading/thread_checker.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_metrics.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_service_observer.h"
+#include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h"
 #include "components/prefs/pref_member.h"
 #include "url/gurl.h"
 
 class PrefService;
 
 namespace base {
 class Clock;
 }
 
 namespace data_reduction_proxy {
@@ skipping 134 matching lines @@
   // Configures data reduction proxy. |at_startup| is true when this method is
   // called in response to creating or loading a new profile.
   void MaybeActivateDataReductionProxy(bool at_startup);
 
   // Returns the event store being used. May be null if
   // InitDataReductionProxySettings has not been called.
   DataReductionProxyEventStore* GetEventStore() const;
 
   // Returns true if the data reduction proxy promo may be shown.
   // This is independent of whether the data reduction proxy is allowed.
   bool PromoAllowed() const {

[megjablon, 2017/06/02 23:01:50]

It doesn't look like this called from anywhere other than
data_reduction_proxy_settings_android.cc. Can we remove this method and just
call drp::params::IsIncludedInPromoFieldTrial() there?

[tbansal1, 2017/06/05 13:48:24]

Done.

-    return promo_allowed_;
+    return data_reduction_proxy::params::IsIncludedInPromoFieldTrial();
   }
 
   DataReductionProxyService* data_reduction_proxy_service() {
     return data_reduction_proxy_service_.get();
   }
 
   // Returns the |DataReductionProxyConfig| being used. May be null if
   // InitDataReductionProxySettings has not been called.
   DataReductionProxyConfig* Config() const {
     return config_;
@@ skipping 88 matching lines @@
   bool unreachable_;
 
   // A call to MaybeActivateDataReductionProxy may take place before the
   // |data_reduction_proxy_service_| has received a DataReductionProxyIOData
   // pointer. In that case, the operation against the IO objects will not
   // succeed and |deferred_initialization_| will be set to true. When
   // OnServiceInitialized is called, if |deferred_initialization_| is true,
   // IO object calls will be performed at that time.
   bool deferred_initialization_;
 
-  // The following values are cached in order to access the values on the
-  // correct thread.
-  bool allowed_;
-  bool promo_allowed_;
-
   // The number of requests to reload the page with images from the Lo-Fi
   // UI until Lo-Fi is disabled for the remainder of the session.
   int lo_fi_user_requests_for_images_per_session_;
 
   // The number of consecutive sessions where Lo-Fi was disabled for
   // Lo-Fi to be disabled until the next implicit opt out epoch, which may be in
   // a later session, or never.
   int lo_fi_consecutive_session_disables_;
 
   BooleanPrefMember spdy_proxy_auth_enabled_;
@@ skipping 15 matching lines @@
   std::unique_ptr<base::Clock> clock_;
 
   base::ThreadChecker thread_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(DataReductionProxySettings);
 };
 
 }  // namespace data_reduction_proxy
 
 #endif  // COMPONENTS_DATA_REDUCTION_PROXY_CORE_BROWSER_DATA_REDUCTION_PROXY_SETTINGS_H_