diff options
author | battre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-30 13:44:43 +0000 |
---|---|---|
committer | battre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-30 13:44:43 +0000 |
commit | d46bc310b61db608ee250f042292364c7bf44656 (patch) | |
tree | ed8033562cef79f3f750ed7113aed88c4c205607 /chrome/android/java | |
parent | 8dcaa264e5fa488d2ac287bf63d2376259fdab25 (diff) | |
download | chromium_src-d46bc310b61db608ee250f042292364c7bf44656.zip chromium_src-d46bc310b61db608ee250f042292364c7bf44656.tar.gz chromium_src-d46bc310b61db608ee250f042292364c7bf44656.tar.bz2 |
Revert 273810 "Added alternative configuration for the data redu..."
Reverting due to failing tests. See http://crbug.com/370039#c5 for details.
> Added alternative configuration for the data reduction proxy
>
> Added a second configuration that can support two http proxies and one https proxy. In the process, added a new DataReductionProxyParams object to encapsulate static configuration details and made DataReductionSettingsAndroid a BrowserKeyedContextService.
>
> BUG=370039
>
> Review URL: https://codereview.chromium.org/286013002
TBR=bengr@chromium.org
Review URL: https://codereview.chromium.org/307013003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273824 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/android/java')
-rw-r--r-- | chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java index 4444a6f..c11c7c8 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java @@ -10,15 +10,8 @@ import org.chromium.base.ThreadUtils; import java.text.NumberFormat; import java.util.Locale; -/** - * Entry point to manage all data reduction proxy configuration details. - */ public class DataReductionProxySettings { - /** - * Data structure to hold the original content length before data reduction and the received - * content length after data reduction. - */ public static class ContentLengths { private final long mOriginal; private final long mReceived; @@ -44,9 +37,6 @@ public class DataReductionProxySettings { private static DataReductionProxySettings sSettings; - /** - * Returns a singleton instance of the settings object. - */ public static DataReductionProxySettings getInstance() { ThreadUtils.assertOnUiThread(); if (sSettings == null) { @@ -62,6 +52,14 @@ public class DataReductionProxySettings { // DataReductionProxySettings is a singleton that lives forever and there's no clean // shutdown of Chrome on Android mNativeDataReductionProxySettings = nativeInit(); + initDataReductionProxySettings(); + } + + /** + * Initializes the data reduction proxy at Chrome startup. + */ + public void initDataReductionProxySettings() { + nativeInitDataReductionProxySettings(mNativeDataReductionProxySettings); } /** @@ -193,6 +191,8 @@ public class DataReductionProxySettings { } private native long nativeInit(); + private native void nativeInitDataReductionProxySettings( + long nativeDataReductionProxySettingsAndroid); private native void nativeBypassHostPattern( long nativeDataReductionProxySettingsAndroid, String pattern); private native void nativeBypassURLPattern( |