Move _changingHistoryState to superclass.

ios/web/web_state/ui/crw_wk_web_view_web_controller.mm

 // Copyright 2014 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.
 
 #import "ios/web/web_state/ui/crw_wk_web_view_web_controller.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 174 matching lines @@
 
   // Referrer for the current page.
   base::scoped_nsobject<NSString> _currentReferrerString;
 
   // Handles downloading PassKit data for WKWebView. Lazy initialized.
   base::scoped_nsobject<CRWPassKitDownloader> _passKitDownloader;
 
   // Object for loading POST requests with body.
   base::scoped_nsobject<CRWJSPOSTRequestLoader> _POSTRequestLoader;
 
-  // Whether the web page is currently performing window.history.pushState or
-  // window.history.replaceState
-  // Set to YES on window.history.willChangeState message. To NO on
-  // window.history.didPushState or window.history.didReplaceState.
-  BOOL _changingHistoryState;
-
   // CRWWebUIManager object for loading WebUI pages.
   base::scoped_nsobject<CRWWebUIManager> _webUIManager;
 
   // Controller used for certs verification to help with blocking requests with
   // bad SSL cert, presenting SSL interstitials and determining SSL status for
   // Navigation Items.
   base::scoped_nsobject<CRWCertVerificationController>
       _certVerificationController;
 
   // CertVerification errors which happened inside
@@ skipping 1083 matching lines @@
   // history changes when a window.history.didPushState or
   // window.history.didReplaceState message is received, which should happen in
   // the next runloop.
   //
   // Otherwise, simulate the whole delegate flow for a load (since the
   // superclass currently doesn't have a clean separation between URL changes
   // and document changes). Note that the order of these calls is important:
   // registering a load request logically comes before updating the document
   // URL, but also must come first since it uses state that is reset on URL
   // changes.
-  if (!_changingHistoryState) {
+  if (!self.changingHistoryState) {
     // If this wasn't a previously-expected load (e.g., certain back/forward
     // navigations), register the load request.
     if (![self isLoadRequestPendingForURL:newURL])
       [self registerLoadRequest:newURL];
   }
 
   [self setDocumentURL:newURL];
 
-  if (!_changingHistoryState) {
+  if (!self.changingHistoryState) {
     [self didStartLoadingURL:_documentURL updateHistory:YES];
     [self updateSSLStatusForCurrentNavigationItem];
     [self didFinishNavigation];
   }
 }
 
 - (BOOL)isLoadRequestPendingForURL:(const GURL&)targetURL {
   if (self.loadPhase != web::LOAD_REQUESTED)
     return NO;
 
@@ skipping 44 matching lines @@
       [scriptMessage.name isEqualToString:kScriptMessageName]) {
     return [self respondToMessage:command
                 userIsInteracting:[self userIsInteracting]
                         originURL:net::GURLWithNSURL([_wkWebView URL])];
   }
 
   NOTREACHED();
   return NO;
 }
 
-- (SEL)selectorToHandleJavaScriptCommand:(const std::string&)command {
-  static std::map<std::string, SEL>* handlers = nullptr;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    handlers = new std::map<std::string, SEL>();
-    (*handlers)["window.history.didPushState"] =
-        @selector(handleWindowHistoryDidPushStateMessage:context:);
-    (*handlers)["window.history.didReplaceState"] =
-        @selector(handleWindowHistoryDidReplaceStateMessage:context:);
-    (*handlers)["window.history.willChangeState"] =
-        @selector(handleWindowHistoryWillChangeStateMessage:context:);
-  });
-  DCHECK(handlers);
-  auto iter = handlers->find(command);
-  return iter != handlers->end()
-             ? iter->second
-             : [super selectorToHandleJavaScriptCommand:command];
-}
-
 - (BOOL)shouldAbortLoadForCancelledError:(NSError*)error {
   DCHECK_EQ(error.code, NSURLErrorCancelled);
   // Do not abort the load if it is for an app specific URL, as such errors
   // are produced during the app specific URL load process.
   const GURL errorURL =
       net::GURLWithNSURL(error.userInfo[NSURLErrorFailingURLErrorKey]);
   if (web::GetWebClient()->IsAppSpecificURL(errorURL))
     return NO;
   // Don't abort NSURLErrorCancelled errors originating from navigation
   // as the WKWebView will automatically retry these loads.
@@ skipping 44 matching lines @@
 }
 
 - (void)webViewScrollViewDidEndDragging:
             (CRWWebViewScrollViewProxy*)webViewScrollViewProxy
                          willDecelerate:(BOOL)decelerate {
   [self evaluateJavaScript:@"__gCrWeb.setWebViewScrollViewIsDragging(false)"
        stringResultHandler:nil];
 }
 
 #pragma mark -
-#pragma mark JavaScript message handlers
-
-- (BOOL)handleWindowHistoryWillChangeStateMessage:
-    (base::DictionaryValue*)message
-                                          context:(NSDictionary*)context {
-  _changingHistoryState = YES;
-  return
-      [super handleWindowHistoryWillChangeStateMessage:message context:context];
-}
-
-- (BOOL)handleWindowHistoryDidPushStateMessage:(base::DictionaryValue*)message
-                                       context:(NSDictionary*)context {
-  DCHECK(_changingHistoryState);
-  _changingHistoryState = NO;
-  return [super handleWindowHistoryDidPushStateMessage:message context:context];
-}
-
-- (BOOL)handleWindowHistoryDidReplaceStateMessage:
-    (base::DictionaryValue*)message
-                                         context:(NSDictionary*)context {
-  DCHECK(_changingHistoryState);
-  _changingHistoryState = NO;
-  return [super handleWindowHistoryDidReplaceStateMessage:message
-                                                  context:context];
-}
-
-#pragma mark -
 #pragma mark WebUI
 
 - (void)createWebUIForURL:(const GURL&)URL {
   [super createWebUIForURL:URL];
   _webUIManager.reset(
       [[CRWWebUIManager alloc] initWithWebState:self.webStateImpl]);
 }
 
 - (void)clearWebUI {
   [super clearWebUI];
@@ skipping 527 matching lines @@
         runJavaScriptTextInputPanelWithPrompt:prompt
                                   defaultText:defaultText
                                    requestURL:requestURL
                             completionHandler:completionHandler];
   } else if (completionHandler) {
     completionHandler(nil);
   }
 }
 
 @end