| Index: android_webview/lib/main/aw_main_delegate.cc
|
| diff --git a/android_webview/lib/main/aw_main_delegate.cc b/android_webview/lib/main/aw_main_delegate.cc
|
| index 26d16d3dc96c5baef82f404de438d3f369739b54..7f465993d48c79aaf8062abc2709d86a3127bcbb 100644
|
| --- a/android_webview/lib/main/aw_main_delegate.cc
|
| +++ b/android_webview/lib/main/aw_main_delegate.cc
|
| @@ -11,7 +11,6 @@
|
| #include "android_webview/browser/browser_view_renderer.h"
|
| #include "android_webview/browser/command_line_helper.h"
|
| #include "android_webview/browser/deferred_gpu_command_service.h"
|
| -#include "android_webview/browser/scoped_allow_wait_for_legacy_web_view_api.h"
|
| #include "android_webview/common/aw_descriptors.h"
|
| #include "android_webview/common/aw_paths.h"
|
| #include "android_webview/common/aw_switches.h"
|
| @@ -55,14 +54,6 @@
|
|
|
| namespace android_webview {
|
|
|
| -namespace {
|
| -
|
| -// TODO(boliu): Remove this global Allow once the underlying issues are
|
| -// resolved - http://crbug.com/240453. See AwMainDelegate::RunProcess below.
|
| -base::LazyInstance<std::unique_ptr<ScopedAllowWaitForLegacyWebViewApi>>::
|
| - DestructorAtExit g_allow_wait_in_ui_thread = LAZY_INSTANCE_INITIALIZER;
|
| -}
|
| -
|
| AwMainDelegate::AwMainDelegate() {
|
| }
|
|
|
| @@ -240,9 +231,6 @@ int AwMainDelegate::RunProcess(
|
| crash_reporter::AddGpuFingerprintToMicrodumpCrashHandler(
|
| content_client_.gpu_fingerprint());
|
|
|
| - g_allow_wait_in_ui_thread.Get().reset(
|
| - new ScopedAllowWaitForLegacyWebViewApi);
|
| -
|
| // Return 0 so that we do NOT trigger the default behavior. On Android, the
|
| // UI message loop is managed by the Java application.
|
| return 0;
|
|
|