Revert of Enable HTTP cleartext configuration for Webview (patchset #3 id:40001 of https://codereview.chromium.org/2676913002/ )
Reason for revert:
Broke the Android chromium builder.
http://build.chromium.org/p/chromium/buildstatus?builder=Android&number=67870
Original issue's description:
> Enable HTTP cleartext configuration for Webview
>
> Android platform enabled a mechanism for apps to opt out of cleartext
> traffic in Android M. WebView did not participate in this though.
> This CL enables applications that are targeting Android O or later
> to enable this feature. The actual feature and how apps can
> opt out is described in
>
> https://developer.android.com/training/articles/security-config.html
>
> The tests for this feature will be added to CTS later.
>
> BUG=473848
>
> Review-Url: https://codereview.chromium.org/2676913002
> Cr-Commit-Position: refs/heads/master@{#448158}
> Committed: https://chromium.googlesource.com/chromium/src/+/db5b9203ab60a38348111860ba713970f8c1df92
TBR=boliu@chromium.org,sgurun@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=473848
Review-Url: https://codereview.chromium.org/2677813002
Cr-Commit-Position: refs/heads/master@{#448160}
diff --git a/android_webview/browser/net/aw_url_request_context_getter.cc b/android_webview/browser/net/aw_url_request_context_getter.cc
index 708fc4d..8bd349a 100644
--- a/android_webview/browser/net/aw_url_request_context_getter.cc
+++ b/android_webview/browser/net/aw_url_request_context_getter.cc
@@ -58,13 +58,6 @@
namespace {
-#if DCHECK_IS_ON()
-bool g_created_url_request_context_builder = false;
-#endif
-// On apps targeting API level O or later, check cleartext is enforced.
-bool g_check_cleartext_permitted = false;
-
-
const base::FilePath::CharType kChannelIDFilename[] = "Origin Bound Certs";
const char kProxyServerSwitch[] = "proxy-server";
@@ -269,11 +262,6 @@
builder.set_host_resolver(std::move(host_resolver));
url_request_context_ = builder.Build();
-#if DCHECK_IS_ON()
- g_created_url_request_context_builder = true;
-#endif
- url_request_context_->set_check_cleartext_permitted(
- g_check_cleartext_permitted);
job_factory_ =
CreateJobFactory(&protocol_handlers_, std::move(request_interceptors_));
@@ -306,12 +294,6 @@
return net_log_.get();
}
-// static
-void AwURLRequestContextGetter::set_check_cleartext_permitted(bool permitted) {
- DCHECK(!g_created_url_request_context_builder);
- g_check_cleartext_permitted = permitted;
-}
-
std::unique_ptr<net::HttpAuthHandlerFactory>
AwURLRequestContextGetter::CreateAuthHandlerFactory(
net::HostResolver* resolver) {
diff --git a/android_webview/browser/net/aw_url_request_context_getter.h b/android_webview/browser/net/aw_url_request_context_getter.h
index 44bf77a..9264092 100644
--- a/android_webview/browser/net/aw_url_request_context_getter.h
+++ b/android_webview/browser/net/aw_url_request_context_getter.h
@@ -47,8 +47,6 @@
// threads (UI and IO).
net::NetLog* GetNetLog();
- static void set_check_cleartext_permitted(bool permitted);
-
private:
friend class AwBrowserContext;
~AwURLRequestContextGetter() override;
diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
index b8b3bf0..5e9fd1b 100644
--- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
+++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
@@ -344,18 +344,13 @@
AwContents.setAwDrawGLFunctionTable(GraphicsUtils.getDrawGLFunctionTable());
}
- private void doNetworkInitializations(Context applicationContext) {
+ private void initNetworkChangeNotifier(Context applicationContext) {
if (applicationContext.checkPermission(Manifest.permission.ACCESS_NETWORK_STATE,
Process.myPid(), Process.myUid()) == PackageManager.PERMISSION_GRANTED) {
NetworkChangeNotifier.init(applicationContext);
NetworkChangeNotifier.setAutoDetectConnectivityState(
new AwNetworkChangeNotifierRegistrationPolicy());
}
-
- int targetSdkVersion = applicationContext.getApplicationInfo().targetSdkVersion;
- // TODO(sgurun) We need to change this to > N_MR1 when we roll N_MR1 sdk or
- // >= O when we roll O SDK to upstream. crbug/688556
- AwContentsStatics.setCheckClearTextPermitted(targetSdkVersion > 25);
}
private void ensureChromiumStartedLocked(boolean onMainThread) {
@@ -427,7 +422,7 @@
final Context context = ContextUtils.getApplicationContext();
setUpResources(webViewPackageName, context);
initPlatSupportLibrary();
- doNetworkInitializations(context);
+ initNetworkChangeNotifier(context);
final boolean isExternalService = true;
AwBrowserProcess.configureChildProcessLauncher(webViewPackageName, isExternalService);
AwBrowserProcess.start();
diff --git a/android_webview/java/src/org/chromium/android_webview/AwContentsStatics.java b/android_webview/java/src/org/chromium/android_webview/AwContentsStatics.java
index 384c362..1ad332a 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwContentsStatics.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwContentsStatics.java
@@ -87,10 +87,6 @@
nativeSetSafeBrowsingEnabled(enable);
}
- public static void setCheckClearTextPermitted(boolean permitted) {
- nativeSetCheckClearTextPermitted(permitted);
- }
-
//--------------------------------------------------------------------------------------------
// Native methods
//--------------------------------------------------------------------------------------------
@@ -102,5 +98,4 @@
AwContentsIoThreadClient ioThreadClient, AwBrowserContext browserContext);
private static native boolean nativeGetSafeBrowsingEnabled();
private static native void nativeSetSafeBrowsingEnabled(boolean enable);
- private static native void nativeSetCheckClearTextPermitted(boolean permitted);
}
diff --git a/android_webview/native/aw_contents_statics.cc b/android_webview/native/aw_contents_statics.cc
index db883d4..975c9527 100644
--- a/android_webview/native/aw_contents_statics.cc
+++ b/android_webview/native/aw_contents_statics.cc
@@ -99,13 +99,6 @@
io_thread_client, browser_context);
}
-// static
-void SetCheckClearTextPermitted(JNIEnv* env,
- const JavaParamRef<jclass>&,
- jboolean permitted) {
- AwURLRequestContextGetter::set_check_cleartext_permitted(permitted);
-}
-
bool RegisterAwContentsStatics(JNIEnv* env) {
return RegisterNativesImpl(env);
}
