diff options
author | Selim Gurun <sgurun@google.com> | 2014-09-03 12:37:51 -0700 |
---|---|---|
committer | Selim Gurun <sgurun@google.com> | 2014-09-03 21:36:46 +0000 |
commit | dd42431b901d53c0b902499a3626151c84619c39 (patch) | |
tree | bba776b816bb0eed2395d324e1da4a73a8402f6b /chromium/java/com | |
parent | 18e8e49dbb79d50be03314b30f997cfa8561c347 (diff) | |
download | webview-dd42431b901d53c0b902499a3626151c84619c39.tar.gz |
Remove the plumbing for optOutDataReductionProxy API
Bug: 17253647
Change-Id: Ic722cd96bf8bfb895aa812a1181b1e0870ce0a1f
Diffstat (limited to 'chromium/java/com')
-rw-r--r-- | chromium/java/com/android/webview/chromium/DataReductionProxyManager.java | 15 | ||||
-rw-r--r-- | chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java | 5 |
2 files changed, 0 insertions, 20 deletions
diff --git a/chromium/java/com/android/webview/chromium/DataReductionProxyManager.java b/chromium/java/com/android/webview/chromium/DataReductionProxyManager.java index dcb9c1e..7fe449c 100644 --- a/chromium/java/com/android/webview/chromium/DataReductionProxyManager.java +++ b/chromium/java/com/android/webview/chromium/DataReductionProxyManager.java @@ -70,9 +70,6 @@ public final class DataReductionProxyManager { } } - // Accessed from multiple threads. - private volatile static boolean sOptedOutDataReductionProxy = false; - private ProxySettingListener mProxySettingListener; private ContentObserver mProxySettingObserver; @@ -142,10 +139,6 @@ public final class DataReductionProxyManager { } private static boolean isDataReductionProxyEnabled(Context context) { - if (sOptedOutDataReductionProxy) { - return false; - } - boolean enabled = getProxySetting(context.getContentResolver(), WEBVIEW_DATA_REDUCTION_PROXY) != 0; // intentional fallback. remove before L release. @@ -180,12 +173,4 @@ public final class DataReductionProxyManager { } return enabled; } - - // UI thread - public static void optOutDataReductionProxy() { - if (!sOptedOutDataReductionProxy) { - sOptedOutDataReductionProxy = true; - AwContentsStatics.setDataReductionProxyEnabled(false); - } - } } diff --git a/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java b/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java index d24df5c..722f705 100644 --- a/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java +++ b/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java @@ -345,11 +345,6 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider { } } - @Override - public void optOutDataReductionProxy() { - DataReductionProxyManager.optOutDataReductionProxy(); - } - // TODO: Add @Override. public void enableSlowWholeDocumentDraw() { WebViewChromium.enableSlowWholeDocumentDraw(); |