[android-webview] Remove weblayer from android webview
This change removes the code that was added in crrev.com/c/2099462.
This code was essentially checking whether an application was using the
weblayer implementation from Android WebView or not. Since weblayer is
deprecated and removed from chromium tree this code is no longer needed.
Bug: 40278228
Change-Id: Ie31899a2a4cf35a04c8990b2cc8857fb9b1cf305
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5267840
Commit-Queue: Abhijeet Kandalkar <abhijeet@igalia.com>
Reviewed-by: Bo Liu <boliu@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1257286}
diff --git a/android_webview/browser/aw_browser_context.cc b/android_webview/browser/aw_browser_context.cc
index 5350c42e..6167ef5 100644
--- a/android_webview/browser/aw_browser_context.cc
+++ b/android_webview/browser/aw_browser_context.cc
@@ -45,7 +45,6 @@
#include "components/autofill/core/browser/autocomplete_history_manager.h"
#include "components/autofill/core/common/autofill_prefs.h"
#include "components/cdm/browser/media_drm_storage_impl.h"
-#include "components/crash/core/common/crash_key.h"
#include "components/download/public/common/in_progress_download_manager.h"
#include "components/keyed_service/core/simple_key_map.h"
#include "components/origin_trials/browser/leveldb_persistence_provider.h"
@@ -92,9 +91,6 @@
const void* const kDownloadManagerDelegateKey = &kDownloadManagerDelegateKey;
-crash_reporter::CrashKeyString<1> g_web_view_compat_crash_key(
- crash_keys::kWeblayerWebViewCompatMode);
-
// Empty method to skip origin security check as DownloadManager will set its
// own method.
bool IgnoreOriginSecurityCheck(const GURL& url) {
@@ -191,7 +187,6 @@
this, profile_metrics::BrowserProfileType::kRegular);
if (IsDefaultBrowserContext()) {
- g_web_view_compat_crash_key.Set("0");
MigrateProfileData(GetHttpCachePath(), GetPath());
} else {
cookie_manager_ = std::make_unique<CookieManager>(this);
@@ -365,10 +360,6 @@
return quota_manager_bridge_.get();
}
-void AwBrowserContext::SetWebLayerRunningInSameProcess(JNIEnv* env) {
- g_web_view_compat_crash_key.Set("1");
-}
-
AwFormDatabaseService* AwBrowserContext::GetFormDatabaseService() {
return form_database_service_.get();
}
diff --git a/android_webview/browser/aw_browser_context.h b/android_webview/browser/aw_browser_context.h
index fd9b36b..4f804d1 100644
--- a/android_webview/browser/aw_browser_context.h
+++ b/android_webview/browser/aw_browser_context.h
@@ -98,7 +98,6 @@
AwQuotaManagerBridge* GetQuotaManagerBridge();
jlong GetQuotaManagerBridge(JNIEnv* env);
- void SetWebLayerRunningInSameProcess(JNIEnv* env);
AwFormDatabaseService* GetFormDatabaseService();
CookieManager* GetCookieManager();
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 67f7905..8f5130d 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
@@ -126,8 +126,6 @@
private static final Object sSingletonLock = new Object();
private static WebViewChromiumFactoryProvider sSingleton;
- // Used to indicate if WebLayer and WebView are running in the same process.
- private static boolean sWebLayerRunningInSameProcess;
private final WebViewChromiumRunQueue mRunQueue =
new WebViewChromiumRunQueue(
@@ -472,14 +470,6 @@
mShouldDisableThreadChecking = shouldDisableThreadChecking(ctx);
setSingleton(this);
-
- // sWebLayerRunningInSameProcess may have been set before initialize().
- if (sWebLayerRunningInSameProcess) {
- addTask(
- () -> {
- getDefaultBrowserContextOnUiThread().setWebLayerRunningInSameProcess();
- });
- }
}
mInitInfo.mDuration = SystemClock.uptimeMillis() - mInitInfo.mStartTime;
@@ -815,28 +805,6 @@
return new FilteredClassLoader(WebViewChromiumFactoryProvider.class.getClassLoader());
}
- // This is called from WebLayer when WebView and WebLayer are run in the same process. It's
- // used to set a crash key to help attribute crashes. It's entirely possible WebView has not
- // been initialized when this is called.
- public static void setWebLayerRunningInSameProcess() {
- // This may be called before initialize().
- synchronized (sSingletonLock) {
- sWebLayerRunningInSameProcess = true;
- if (sSingleton == null) {
- // initialize() hasn't been called yet. When initialize() is called
- // |sWebLayerRunningInSameProcess| will be checked.
- return;
- }
- }
- getSingleton()
- .addTask(
- () -> {
- getSingleton()
- .getDefaultBrowserContextOnUiThread()
- .setWebLayerRunningInSameProcess();
- });
- }
-
@RequiresApi(Build.VERSION_CODES.R)
@Override
public PacProcessor getPacProcessor() {
diff --git a/android_webview/java/src/org/chromium/android_webview/AwBrowserContext.java b/android_webview/java/src/org/chromium/android_webview/AwBrowserContext.java
index e195828..2749def 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwBrowserContext.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwBrowserContext.java
@@ -207,11 +207,6 @@
return sInstance;
}
- // See comments in WebViewChromiumFactoryProvider for details.
- public void setWebLayerRunningInSameProcess() {
- AwBrowserContextJni.get().setWebLayerRunningInSameProcess(mNativeAwBrowserContext);
- }
-
public void clearPersistentOriginTrialStorageForTesting() {
AwBrowserContextJni.get()
.clearPersistentOriginTrialStorageForTesting(mNativeAwBrowserContext);
@@ -265,8 +260,6 @@
long getQuotaManagerBridge(long nativeAwBrowserContext);
- void setWebLayerRunningInSameProcess(long nativeAwBrowserContext);
-
String[] updateServiceWorkerXRequestedWithAllowListOriginMatcher(
long nativeAwBrowserContext, String[] rules);
