Fixes document type detection on iOS 9.

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"
 
 #import <WebKit/WebKit.h>
 
 #include "base/ios/ios_util.h"
 #include "base/ios/weak_nsobject.h"
@@ skipping 24 matching lines @@
 #import "ios/web/web_state/js/page_script_util.h"
 #import "ios/web/web_state/ui/crw_web_controller+protected.h"
 #import "ios/web/web_state/ui/crw_wk_web_view_crash_detector.h"
 #import "ios/web/web_state/ui/web_view_js_utils.h"
 #import "ios/web/web_state/ui/wk_back_forward_list_item_holder.h"
 #import "ios/web/web_state/ui/wk_web_view_configuration_provider.h"
 #import "ios/web/web_state/web_state_impl.h"
 #import "ios/web/web_state/web_view_internal_creation_util.h"
 #import "ios/web/web_state/wk_web_view_security_util.h"
 #import "ios/web/webui/crw_web_ui_manager.h"
+#import "net/base/mac/url_conversions.h"
 #include "net/cert/x509_certificate.h"
-#import "net/base/mac/url_conversions.h"
 #include "net/ssl/ssl_info.h"
 #include "url/url_constants.h"
 
 namespace {
 // Extracts Referer value from WKNavigationAction request header.
 NSString* GetRefererFromNavigationAction(WKNavigationAction* action) {
   return [action.request valueForHTTPHeaderField:@"Referer"];
 }
 
 NSString* const kScriptMessageName = @"crwebinvoke";
@@ skipping 367 matching lines @@
 // to |WEB_VIEW_DOCUMENT| because it does not support iframe creation used
 // by core.js to communicate back. That functionality is only supported
 // by |WEB_VIEW_HTML_DOCUMENT|. |WEB_VIEW_DOCUMENT| is used when displaying
 // non-HTML contents (e.g. PDF documents).
 - (web::WebViewDocumentType)webViewDocumentType {
   // This happens during tests.
   if (!_wkWebView) {
     return web::WEB_VIEW_DOCUMENT_TYPE_GENERIC;
   }
 
   if (!self.documentMIMEType) {

[Eugene But (OOO till 7-30), 2015/11/19 16:29:01]

I would move this check inside documentTypeFromMIMEType:. I can imagine cases
when document.contentType will not be defined for UIWebView.

[stkhapugin, 2015/11/20 10:50:43]

Done.

     return web::WEB_VIEW_DOCUMENT_TYPE_UNKNOWN;
   }
 
-  if ([self.documentMIMEType isEqualToString:@"text/html"] ||
-      [self.documentMIMEType isEqualToString:@"application/xhtml+xml"] ||
-      [self.documentMIMEType isEqualToString:@"application/xml"]) {
-    return web::WEB_VIEW_DOCUMENT_TYPE_HTML;
-  }
-
-  return web::WEB_VIEW_DOCUMENT_TYPE_GENERIC;
+  return [self documentTypeFromMIMEType:self.documentMIMEType];
 }
 
 - (void)loadRequest:(NSMutableURLRequest*)request {
   [_wkWebView loadRequest:request];
 }
 
 - (void)loadWebHTMLString:(NSString*)html forURL:(const GURL&)URL {
   [_wkWebView loadHTMLString:html baseURL:net::NSURLWithGURL(URL)];
 }
 
@@ skipping 1031 matching lines @@
                               placeholderText:defaultText
                                    requestURL:
             net::GURLWithNSURL(frame.request.URL)
                             completionHandler:completionHandler];
   } else if (completionHandler) {
     completionHandler(nil);
   }
 }
 
 @end