| Index: ios/chrome/app/main_controller.mm
|
| diff --git a/ios/chrome/app/main_controller.mm b/ios/chrome/app/main_controller.mm
|
| index 5b0bda09a17730b19e62b5552f753b6068b4681e..830b78049d6e112b52b1672df373bf3b4147e407 100644
|
| --- a/ios/chrome/app/main_controller.mm
|
| +++ b/ios/chrome/app/main_controller.mm
|
| @@ -127,7 +127,6 @@
|
| #include "ios/chrome/browser/xcallback_parameters.h"
|
| #include "ios/chrome/grit/ios_strings.h"
|
| #include "ios/net/cookies/cookie_store_ios.h"
|
| -#import "ios/net/crn_http_protocol_handler.h"
|
| #include "ios/public/provider/chrome/browser/chrome_browser_provider.h"
|
| #include "ios/public/provider/chrome/browser/distribution/app_distribution_provider.h"
|
| #import "ios/public/provider/chrome/browser/native_app_launcher/native_app_whitelist_manager.h"
|
| @@ -137,7 +136,6 @@
|
| #import "ios/third_party/material_roboto_font_loader_ios/src/src/MaterialRobotoFontLoader.h"
|
| #include "ios/web/net/request_tracker_factory_impl.h"
|
| #include "ios/web/net/request_tracker_impl.h"
|
| -#include "ios/web/net/web_http_protocol_handler_delegate.h"
|
| #import "ios/web/public/navigation_manager.h"
|
| #include "ios/web/public/web_capabilities.h"
|
| #include "ios/web/public/web_state/web_state.h"
|
| @@ -317,10 +315,6 @@ enum class StackViewDismissalMode { NONE, NORMAL, INCOGNITO };
|
| // RequestTrackerFactory to customize the behavior of the network stack.
|
| std::unique_ptr<web::RequestTrackerFactoryImpl> _requestTrackerFactory;
|
|
|
| - // Configuration for the HTTP protocol handler.
|
| - std::unique_ptr<web::WebHTTPProtocolHandlerDelegate>
|
| - _httpProtocolHandlerDelegate;
|
| -
|
| // True if First Run UI (terms of service & sync sign-in) is being presented
|
| // in a modal dialog.
|
| BOOL _isPresentingFirstRunUI;
|
| @@ -571,7 +565,6 @@ enum class StackViewDismissalMode { NONE, NORMAL, INCOGNITO };
|
|
|
| - (void)dealloc {
|
| [[NSNotificationCenter defaultCenter] removeObserver:self];
|
| - net::HTTPProtocolHandlerDelegate::SetInstance(nullptr);
|
| net::RequestTracker::SetRequestTrackerFactory(nullptr);
|
| [NSObject cancelPreviousPerformRequestsWithTarget:self];
|
| [super dealloc];
|
| @@ -647,8 +640,7 @@ enum class StackViewDismissalMode { NONE, NORMAL, INCOGNITO };
|
| // TODO(crbug.com/546171): Audit all the following code to see if some of it
|
| // should move into BrowserMainParts or BrowserProcess.
|
|
|
| - [NetworkStackSetup setUpChromeNetworkStack:&_requestTrackerFactory
|
| - httpProtocolHandlerDelegate:&_httpProtocolHandlerDelegate];
|
| + _requestTrackerFactory = [NetworkStackSetup setUpChromeNetworkStack];
|
| }
|
|
|
| - (void)startUpBrowserForegroundInitialization {
|
|
|