Add data reduction functionality to all platforms.

chrome/browser/profiles/profile_io_data.h

 // Copyright (c) 2012 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 CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
 #define CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/prefs/pref_member.h"
 #include "base/synchronization/lock.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/storage_partition_descriptor.h"
 #include "components/content_settings/core/common/content_settings_types.h"
+#include "components/data_reduction_proxy/browser/data_reduction_proxy_settings.h"
 #include "components/data_reduction_proxy/browser/data_reduction_proxy_usage_stats.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/resource_context.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/http/http_cache.h"
 #include "net/http/http_network_session.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_job_factory.h"
 
 class ChromeHttpUserAgentSettings;
@@ skipping 134 matching lines @@
   }
 
   net::URLRequestContext* extensions_request_context() const {
     return extensions_request_context_.get();
   }
 
   BooleanPrefMember* safe_browsing_enabled() const {
     return &safe_browsing_enabled_;
   }
 
-#if defined(SPDY_PROXY_AUTH_ORIGIN)
   // TODO(feng): move the function to protected area.
   // IsDataReductionProxyEnabled() should be used as public API.
   BooleanPrefMember* data_reduction_proxy_enabled() const {
     return &data_reduction_proxy_enabled_;
   }
-#endif
 
   BooleanPrefMember* printing_enabled() const {
     return &printing_enabled_;
   }
 
   BooleanPrefMember* sync_disabled() const {
     return &sync_disabled_;
   }
 
   BooleanPrefMember* signin_allowed() const {
@@ skipping 46 matching lines @@
 
   // Initialize the member needed to track the metrics enabled state. This is
   // only to be called on the UI thread.
   void InitializeMetricsEnabledStateOnUIThread();
 
   // Returns whether or not metrics reporting is enabled in the browser instance
   // on which this profile resides. This is safe for use from the IO thread, and
   // should only be called from there.
   bool GetMetricsEnabledStateOnIOThread() const;
 
-#if defined(OS_ANDROID)
   // Returns whether or not data reduction proxy is enabled in the browser
   // instance on which this profile resides.
   bool IsDataReductionProxyEnabled() const;

[mmenke, 2014/09/08 18:11:14]

Is this used anywhere?  If so, I don't see any uses of it where the surrounding
OS_ANDROID has been removed in this CL.  If not, we should probably get rid of
it until/unless we need it.

[Not at Google. Contact bengr, 2014/09/08 19:18:35]

No current uses. Removed.

The intention was to switch all uses of data_reduction_proxy_enabled() with this
call(see comment on line 180). Discussed with Ben, and he said it was fine to
remove.

[Not at Google. Contact bengr, 2014/09/08 19:29:38]

Upon review, this is used in chrome_resource_dispatcher_host_delegate.cc. Did
not notice earlier since I built for desktop, but caught this when testing for
Android.
https://cs.corp.google.com/#clankium/src/chrome/browser/renderer_host/chrome_...

-#endif
 
   void set_client_cert_store_factory_for_testing(
     const base::Callback<scoped_ptr<net::ClientCertStore>()>& factory) {
       client_cert_store_factory_ = factory;
   }
 
  protected:
   // A URLRequestContext for media that owns its HTTP factory, to ensure
   // it is deleted.
   class MediaRequestContext : public net::URLRequestContext {
@@ skipping 262 matching lines @@
 
   mutable StringListPrefMember one_click_signin_rejected_email_list_;
 
   mutable scoped_refptr<MediaDeviceIDSalt> media_device_id_salt_;
 
   // Member variables which are pointed to by the various context objects.
   mutable BooleanPrefMember enable_referrers_;
   mutable BooleanPrefMember enable_do_not_track_;
   mutable BooleanPrefMember force_safesearch_;
   mutable BooleanPrefMember safe_browsing_enabled_;
-#if defined(SPDY_PROXY_AUTH_ORIGIN)
   mutable BooleanPrefMember data_reduction_proxy_enabled_;
-#endif
   mutable BooleanPrefMember printing_enabled_;
   mutable BooleanPrefMember sync_disabled_;
   mutable BooleanPrefMember signin_allowed_;
   mutable IntegerPrefMember network_prediction_options_;
   // TODO(marja): Remove session_startup_pref_ if no longer needed.
   mutable IntegerPrefMember session_startup_pref_;
   mutable BooleanPrefMember quick_check_enabled_;
   mutable IntegerPrefMember incognito_availibility_pref_;
 
   // The state of metrics reporting in the browser that this profile runs on.
@@ skipping 61 matching lines @@
 
   // TODO(jhawkins): Remove once crbug.com/102004 is fixed.
   bool initialized_on_UI_thread_;
 
   const Profile::ProfileType profile_type_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
 };
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_