Moved |openedByDOM| to WebState's CreateParams and public interface.

ios/web/web_state/ui/crw_web_controller.mm

 // Copyright 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.
 
 #import "ios/web/web_state/ui/crw_web_controller.h"
 
 #import <WebKit/WebKit.h>
 
 #import <objc/runtime.h>
 #include <stddef.h>
@@ skipping 1846 matching lines @@
   // Remove the transient content view.
   [self clearTransientContentView];
 
   web::NavigationItem* item = self.currentNavItem;
   const GURL currentURL = item ? item->GetURL() : GURL::EmptyGURL();
   // If it's a chrome URL, but not a native one, create the WebUI instance.
   if (web::GetWebClient()->IsAppSpecificURL(currentURL) &&
       ![_nativeProvider hasControllerForURL:currentURL]) {
     if (!(item->GetTransitionType() & ui::PAGE_TRANSITION_TYPED ||
           item->GetTransitionType() & ui::PAGE_TRANSITION_AUTO_BOOKMARK) &&
-        self.sessionController.openedByDOM) {
+        self.webState && self.webState->HasOpener()) {
       // WebUI URLs can not be opened by DOM to prevent cross-site scripting as
       // they have increased power. WebUI URLs may only be opened when the user
       // types in the URL or use bookmarks.
       [[self sessionController] discardNonCommittedItems];
       return;
     } else {
       [self createWebUIForURL:currentURL];
     }
   }
 
@@ skipping 310 matching lines @@
 
 - (CRWJSInjectionReceiver*)jsInjectionReceiver {
   return _jsInjectionReceiver;
 }
 
 - (BOOL)shouldClosePageOnNativeApplicationLoad {
   // The page should be closed if it was initiated by the DOM and there has been
   // no user interaction with the page since the web view was created, or if
   // the page has no navigation items, as occurs when an App Store link is
   // opened from another application.
-  BOOL rendererInitiatedWithoutInteraction =
-      self.sessionController.openedByDOM && !_userInteractedWithWebController;
+  BOOL rendererInitiatedWithoutInteraction = self.webState &&
+                                             self.webState->HasOpener() &&
+                                             !_userInteractedWithWebController;
   BOOL noNavigationItems = !(self.navigationManagerImpl->GetItemCount());
   return rendererInitiatedWithoutInteraction || noNavigationItems;
 }
 
 - (BOOL)usesDesktopUserAgent {
   web::NavigationItem* item = self.currentNavItem;
   return item && item->GetUserAgentType() == web::UserAgentType::DESKTOP;
 }
 
 - (web::MojoFacade*)mojoFacade {
@@ skipping 1999 matching lines @@
       referrer.length ? GURL(base::SysNSStringToUTF8(referrer)) : _documentURL;
 
   WebState* childWebState = _webStateImpl->CreateNewWebState(
       requestURL, openerURL, [self userIsInteracting]);
   if (!childWebState)
     return nil;
 
   CRWWebController* childWebController =
       static_cast<WebStateImpl*>(childWebState)->GetWebController();
 
-  DCHECK(!childWebController ||
-         childWebController.sessionController.openedByDOM);
+  DCHECK(!childWebController || (childWebController.webState &&
+                                 childWebController.webState->HasOpener()));
 
   // WKWebView requires WKUIDelegate to return a child view created with
   // exactly the same |configuration| object (exception is raised if config is
   // different). |configuration| param and config returned by
   // WKWebViewConfigurationProvider are different objects because WKWebView
   // makes a shallow copy of the config inside init, so every WKWebView
   // owns a separate shallow copy of WKWebViewConfiguration.
   [childWebController ensureWebViewCreatedWithConfiguration:configuration];
   return childWebController.webView;
 }
 
 - (void)webViewDidClose:(WKWebView*)webView {
-  if (self.sessionController.openedByDOM) {
+  if (self.webState && self.webState->HasOpener())

[Eugene But (OOO till 7-30), 2017/03/18 00:33:30]

|self.webState && self.webState->HasOpener()| is quite common code in web
controller. Do you want to add |- (BOOL)hasOpener| helper method?

[kkhorimoto, 2017/03/20 22:39:20]

Done.

     _webStateImpl->CloseWebState();
-  }
 }
 
 - (void)webView:(WKWebView*)webView
     runJavaScriptAlertPanelWithMessage:(NSString*)message
                       initiatedByFrame:(WKFrameInfo*)frame
                      completionHandler:(void (^)())completionHandler {
   [self runJavaScriptDialogOfType:web::JAVASCRIPT_DIALOG_TYPE_ALERT
                  initiatedByFrame:frame
                           message:message
                       defaultText:nil
@@ skipping 825 matching lines @@
 - (void)simulateLoadRequestWithURL:(const GURL&)URL {
   _lastRegisteredRequestURL = URL;
   _loadPhase = web::LOAD_REQUESTED;
 }
 
 - (NSString*)referrerFromNavigationAction:(WKNavigationAction*)action {
   return [action.request valueForHTTPHeaderField:kReferrerHeaderName];
 }
 
 @end