Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2535)

Unified Diff: android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java

Issue 2526873002: aw: Fix mStarted assert (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
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 687eaa1ed6cd1bb6ce7429686c1119ee5e406bb4..1b51853f0933e02a1d7e4c77e06a1889d4b102f9 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
@@ -417,6 +417,8 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
}
});
+ mStarted = true;
+
// Initialize thread-unsafe singletons.
AwBrowserContext awBrowserContext = getBrowserContextOnUiThread();
mGeolocationPermissions = new GeolocationPermissionsAdapter(
@@ -427,7 +429,6 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
awBrowserContext.getServiceWorkerController());
}
- mStarted = true;
mRunQueue.drainQueue();
}
@@ -443,8 +444,7 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
// Only on UI thread.
AwBrowserContext getBrowserContextOnUiThread() {
- // TODO(crbug.com/667337)
- // assert mStarted;
+ assert mStarted;
if (BuildConfig.DCHECK_IS_ON && !ThreadUtils.runningOnUiThread()) {
throw new RuntimeException(
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698