Remove the plumbing for optOutDataReductionProxy API Bug: 17253647 Change-Id: Ic722cd96bf8bfb895aa812a1181b1e0870ce0a1f
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 @@ } } - // Accessed from multiple threads. - private volatile static boolean sOptedOutDataReductionProxy = false; - private ProxySettingListener mProxySettingListener; private ContentObserver mProxySettingObserver; @@ -142,10 +139,6 @@ } 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 @@ } 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 c688d44..b185378 100644 --- a/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java +++ b/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
@@ -349,11 +349,6 @@ } } - @Override - public void optOutDataReductionProxy() { - DataReductionProxyManager.optOutDataReductionProxy(); - } - // TODO: Add @Override. public void enableSlowWholeDocumentDraw() { WebViewChromium.enableSlowWholeDocumentDraw();