Renderers should obtain browser InterfaceProvider by connecting to browser

android_webview/browser/aw_browser_main_parts.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "android_webview/browser/aw_browser_main_parts.h"
 
 #include "android_webview/browser/aw_browser_context.h"
+#include "android_webview/browser/aw_content_browser_client.h"
 #include "android_webview/browser/aw_dev_tools_discovery_provider.h"
 #include "android_webview/browser/aw_result_codes.h"
 #include "android_webview/browser/deferred_gpu_command_service.h"
 #include "android_webview/browser/net/aw_network_change_notifier_factory.h"
 #include "android_webview/common/aw_resource.h"
 #include "android_webview/common/aw_switches.h"
 #include "base/android/apk_assets.h"
 #include "base/android/build_info.h"
 #include "base/android/locale_utils.h"
 #include "base/android/memory_pressure_listener_android.h"
@@ skipping 51 matching lines @@
   scoped_refptr<device::AccessTokenStore> CreateAccessTokenStore() final {
     return new AwAccessTokenStore();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AwGeolocationDelegate);
 };
 
 }  // anonymous namespace
 
-AwBrowserMainParts::AwBrowserMainParts(AwBrowserContext* browser_context)
-    : browser_context_(browser_context) {
+AwBrowserMainParts::AwBrowserMainParts(AwContentBrowserClient* browser_client)
+    : browser_client_(browser_client) {
 }
 
 AwBrowserMainParts::~AwBrowserMainParts() {
 }
 
 void AwBrowserMainParts::PreEarlyInitialization() {
   net::NetworkChangeNotifier::SetFactory(new AwNetworkChangeNotifierFactory());
 
   // Android WebView does not use default MessageLoop. It has its own
   // Android specific MessageLoop. Also see MainMessageLoopRun.
@@ skipping 27 matching lines @@
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kSingleProcess)) {
     // Create the renderers crash manager on the UI thread.
     breakpad::CrashMicroDumpManager::GetInstance();
   }
 
   return content::RESULT_CODE_NORMAL_EXIT;
 }
 
 void AwBrowserMainParts::PreMainMessageLoopRun() {
-  browser_context_->PreMainMessageLoopRun();
+  browser_client_->InitBrowserContext()->PreMainMessageLoopRun();
 
   device::GeolocationProvider::SetGeolocationDelegate(
       new AwGeolocationDelegate());
 
   AwDevToolsDiscoveryProvider::Install();
 
   content::RenderFrameHost::AllowInjectingJavaScriptForAndroidWebView();
 }
 
 bool AwBrowserMainParts::MainMessageLoopRun(int* result_code) {
   // Android WebView does not use default MessageLoop. It has its own
   // Android specific MessageLoop.
   return true;
 }
 
 }  // namespace android_webview