Fixes document type detection on iOS 9.

Fixes document type detection on iOS 9.

On iOS 9, evaluating '' + document always results in [object
HTMLDocument], even for PDFs. This introduces another way of checking
document type on iOS 9. Unfortunately, it doesn't work on iOS 8, so the
old implementation needs to stay too.

BUG=549604
Committed: https://crrev.com/704def3b29d00bf39aca6553a079152171af4ad9
Cr-Commit-Position: refs/heads/master@{#361095}

[stkhapugin, 2015-11-18 15:38:45]

stkhapugin@chromium.org changed reviewers:
+ eugenebut@chromium.org

[stkhapugin, 2015-11-18 15:38:45]

PTAL

[Eugene But (OOO till 7-30), 2015-11-18 16:30:57]

https://codereview.chromium.org/1458703004/diff/1/ios/web/web_state/ui/crw_ui...
File ios/web/web_state/ui/crw_ui_web_view_web_controller.mm (right):

https://codereview.chromium.org/1458703004/diff/1/ios/web/web_state/ui/crw_ui...
ios/web/web_state/ui/crw_ui_web_view_web_controller.mm:554: if
(base::ios::IsRunningOnIOS9OrLater()) {
Please explain in the comments why iOS9 implementation is different.

https://codereview.chromium.org/1458703004/diff/1/ios/web/web_state/ui/crw_ui...
ios/web/web_state/ui/crw_ui_web_view_web_controller.mm:557: if ([documentType
isEqualToString:@"text/html"])
I think you also want to check for "application/xhtml+xml" and "application/xml"
MIME types. And please unify this code with -[CRWWKWebViewWebController
webViewDocumentType] by adding |documentTypeFromMIMEType:| method to
CRWWebController.

[stkhapugin, 2015-11-19 16:16:35]

PTAL

https://codereview.chromium.org/1458703004/diff/1/ios/web/web_state/ui/crw_ui...
File ios/web/web_state/ui/crw_ui_web_view_web_controller.mm (right):

https://codereview.chromium.org/1458703004/diff/1/ios/web/web_state/ui/crw_ui...
ios/web/web_state/ui/crw_ui_web_view_web_controller.mm:554: if
(base::ios::IsRunningOnIOS9OrLater()) {
On 2015/11/18 16:30:57, eugenebut wrote:
> Please explain in the comments why iOS9 implementation is different.

Done.

https://codereview.chromium.org/1458703004/diff/1/ios/web/web_state/ui/crw_ui...
ios/web/web_state/ui/crw_ui_web_view_web_controller.mm:557: if ([documentType
isEqualToString:@"text/html"])
On 2015/11/18 16:30:57, eugenebut wrote:
> I think you also want to check for "application/xhtml+xml" and
"application/xml"
> MIME types. And please unify this code with -[CRWWKWebViewWebController
> webViewDocumentType] by adding |documentTypeFromMIMEType:| method to
> CRWWebController.

Done.

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

lgtm with changes

https://codereview.chromium.org/1458703004/diff/20001/ios/web/web_state/ui/cr...
File ios/web/web_state/ui/crw_ui_web_view_web_controller.mm (right):

https://codereview.chromium.org/1458703004/diff/20001/ios/web/web_state/ui/cr...
ios/web/web_state/ui/crw_ui_web_view_web_controller.mm:559: NSString*
documentType = [_uiWebView
s/documentType/MIMEType

https://codereview.chromium.org/1458703004/diff/20001/ios/web/web_state/ui/cr...
File ios/web/web_state/ui/crw_web_controller+protected.h (right):

https://codereview.chromium.org/1458703004/diff/20001/ios/web/web_state/ui/cr...
ios/web/web_state/ui/crw_web_controller+protected.h:125: -
(web::WebViewDocumentType)documentTypeFromMIMEType:(NSString*)MIMEType;
This interface is divided by section. And this very section is "Methods
implemented by subclasses". 

Please move this method lower to "Internal methods for use by subclasses"
section.

https://codereview.chromium.org/1458703004/diff/20001/ios/web/web_state/ui/cr...
File ios/web/web_state/ui/crw_web_controller.mm (right):

https://codereview.chromium.org/1458703004/diff/20001/ios/web/web_state/ui/cr...
ios/web/web_state/ui/crw_web_controller.mm:823: -
(web::WebViewDocumentType)documentTypeFromMIMEType:(NSString*)MIMEType {
NIT: Please try keeping the same order for interface and implementation methods
(I know we are inconsistent with this). 

F.e. if in the header |documentTypeFromMIMEType:| is placed after |foo|, then in
the implementation |documentTypeFromMIMEType:| should also be placed after
|foo|.

https://codereview.chromium.org/1458703004/diff/20001/ios/web/web_state/ui/cr...
File ios/web/web_state/ui/crw_wk_web_view_web_controller.mm (right):

https://codereview.chromium.org/1458703004/diff/20001/ios/web/web_state/ui/cr...
ios/web/web_state/ui/crw_wk_web_view_web_controller.mm:434: if
(!self.documentMIMEType) {
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:44]

Addressed comments. Thank you!

https://codereview.chromium.org/1458703004/diff/20001/ios/web/web_state/ui/cr...
File ios/web/web_state/ui/crw_ui_web_view_web_controller.mm (right):

https://codereview.chromium.org/1458703004/diff/20001/ios/web/web_state/ui/cr...
ios/web/web_state/ui/crw_ui_web_view_web_controller.mm:559: NSString*
documentType = [_uiWebView
On 2015/11/19 16:29:01, eugenebut wrote:
> s/documentType/MIMEType

Done.

https://codereview.chromium.org/1458703004/diff/20001/ios/web/web_state/ui/cr...
File ios/web/web_state/ui/crw_web_controller+protected.h (right):

https://codereview.chromium.org/1458703004/diff/20001/ios/web/web_state/ui/cr...
ios/web/web_state/ui/crw_web_controller+protected.h:125: -
(web::WebViewDocumentType)documentTypeFromMIMEType:(NSString*)MIMEType;
On 2015/11/19 16:29:01, eugenebut wrote:
> This interface is divided by section. And this very section is "Methods
> implemented by subclasses". 
> 
> Please move this method lower to "Internal methods for use by subclasses"
> section.

Done.

https://codereview.chromium.org/1458703004/diff/20001/ios/web/web_state/ui/cr...
File ios/web/web_state/ui/crw_web_controller.mm (right):

https://codereview.chromium.org/1458703004/diff/20001/ios/web/web_state/ui/cr...
ios/web/web_state/ui/crw_web_controller.mm:823: -
(web::WebViewDocumentType)documentTypeFromMIMEType:(NSString*)MIMEType {
On 2015/11/19 16:29:01, eugenebut wrote:
> NIT: Please try keeping the same order for interface and implementation
methods
> (I know we are inconsistent with this). 
> 
> F.e. if in the header |documentTypeFromMIMEType:| is placed after |foo|, then
in
> the implementation |documentTypeFromMIMEType:| should also be placed after
> |foo|.

Done.

https://codereview.chromium.org/1458703004/diff/20001/ios/web/web_state/ui/cr...
File ios/web/web_state/ui/crw_wk_web_view_web_controller.mm (right):

https://codereview.chromium.org/1458703004/diff/20001/ios/web/web_state/ui/cr...
ios/web/web_state/ui/crw_wk_web_view_web_controller.mm:434: if
(!self.documentMIMEType) {
On 2015/11/19 16:29:01, eugenebut wrote:
> I would move this check inside documentTypeFromMIMEType:. I can imagine cases
> when document.contentType will not be defined for UIWebView.

Done.

[stkhapugin, 2015-11-20 10:50:52]

The CQ bit was checked by stkhapugin@chromium.org

[stkhapugin, 2015-11-20 10:50:53]

The patchset sent to the CQ was uploaded after l-g-t-m from
eugenebut@chromium.org
Link to the patchset: https://codereview.chromium.org/1458703004/#ps40001
(title: "Comments 2")

[commit-bot: I haz the power, 2015-11-20 10:51:02]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1458703004/40001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1458703004/40001

[commit-bot: I haz the power, 2015-11-20 10:52:52]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-11-20 10:52:52]

Try jobs failed on following builders:
  ios_dbg_simulator_ninja on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios_dbg_simulator...)
  ios_rel_device_ninja on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios_rel_device_ni...)
  mac_chromium_compile_dbg_ng on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_comp...)
  mac_chromium_gn_rel on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_gn_r...)
  mac_chromium_rel_ng on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_rel_...)

[stkhapugin, 2015-11-20 17:01:04]

Oops, didn't sync for weeks. PTAL :)

[Eugene But (OOO till 7-30), 2015-11-20 18:13:49]

still lgtm

https://codereview.chromium.org/1458703004/diff/60001/ios/web/web_state/ui/cr...
File ios/web/web_state/ui/crw_wk_web_view_web_controller.mm (right):

https://codereview.chromium.org/1458703004/diff/60001/ios/web/web_state/ui/cr...
ios/web/web_state/ui/crw_wk_web_view_web_controller.mm:512: std::string mimeType
= self.webState->GetContentsMimeType();
Optional NIT: Could you please s/mimeType/MIMEType :)

I originally wrote this code with incorrect name :(

[stkhapugin, 2015-11-23 13:35:19]

The CQ bit was checked by stkhapugin@chromium.org

[stkhapugin, 2015-11-23 13:35:19]

The patchset sent to the CQ was uploaded after l-g-t-m from
eugenebut@chromium.org
Link to the patchset: https://codereview.chromium.org/1458703004/#ps80001
(title: "s/mimeType/MIMEType")

[commit-bot: I haz the power, 2015-11-23 13:35:35]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1458703004/80001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1458703004/80001

[stkhapugin, 2015-11-23 13:35:49]

Thanks Eugene! I corrected MIMEType. Checking CQ.

https://codereview.chromium.org/1458703004/diff/60001/ios/web/web_state/ui/cr...
File ios/web/web_state/ui/crw_wk_web_view_web_controller.mm (right):

https://codereview.chromium.org/1458703004/diff/60001/ios/web/web_state/ui/cr...
ios/web/web_state/ui/crw_wk_web_view_web_controller.mm:512: std::string mimeType
= self.webState->GetContentsMimeType();
On 2015/11/20 18:13:49, eugenebut wrote:
> Optional NIT: Could you please s/mimeType/MIMEType :)
> 
> I originally wrote this code with incorrect name :(

Done.

[commit-bot: I haz the power, 2015-11-23 13:49:43]

Committed patchset #5 (id:80001)

[commit-bot: I haz the power, 2015-11-23 13:50:46]

Patchset 5 (id:??) landed as
https://crrev.com/704def3b29d00bf39aca6553a079152171af4ad9
Cr-Commit-Position: refs/heads/master@{#361095}