Add additional global state to ios_global_state

Desktop / Chromium - Mike Dougherty [chromium.org] - 17 July 2017 14:16 EDT

Expands on the shared initialization to include base::AtExitManager, net::NetworkChangeNotifier, and base::MessageLoopForUI.

With this change Cronet and ChromeWebView can successfully be used when built together in the framework created by //ios/web_view:cronet_web_view_combined.

Bug: 738510 Cq-Include-Trybots: master.tryserver.chromium.android:android_cronet_tester Change-Id: Iead4ba5d4f2376b09edf3f5c87a13829229b83b4 Reviewed-on: https://chromium-review.googlesource.com/558268 Commit-Queue: Mike Dougherty

a8d8165 Add additional global state to ios_global_state.
components/cronet/ios/cronet_environment.h | 1 -
components/cronet/ios/cronet_environment.mm | 31 ++++-------------
ios/web/app/web_main_loop.h | 7 ----
ios/web/app/web_main_loop.mm | 15 +++------
ios/web/app/web_main_runner.mm | 18 +++++-----
ios/web/public/global_state/BUILD.gn | 1 +
ios/web/public/global_state/ios_global_state.h | 36 +++++++++++++++++++-
ios/web/public/global_state/ios_global_state.mm | 45 ++++++++++++++++++++++++-
8 files changed, 98 insertions(+), 56 deletions(-)

Upstream: git.chromium.org


  • Share