From 2db70b37076920a6cbfa039719253ffc278e271f Mon Sep 17 00:00:00 2001
From: baxley <baxley@chromium.org>
Date: Thu, 14 Jan 2016 14:47:16 -0800
Subject: [PATCH] Make WKWebView default for the web shell.

Change web shell so that it defaults to WKWebView, if it is
supported. Also remove use of FORCE_ENABLE_WKWEBVIEW in the web
shell.

BUG=

Review URL: https://codereview.chromium.org/1586283002

Cr-Commit-Position: refs/heads/master@{#369588}
---
 ios/web/shell/view_controller.mm | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/ios/web/shell/view_controller.mm b/ios/web/shell/view_controller.mm
index 3d3ce354862872..f7bc3514d3cf05 100644
--- a/ios/web/shell/view_controller.mm
+++ b/ios/web/shell/view_controller.mm
@@ -30,14 +30,9 @@
 #include "ui/base/page_transition_types.h"
 
 namespace {
-// Returns true if WKWebView should be used instead of UIWebView.
-// TODO(stuartmorgan): Decide on a better way to control this.
+// Returns true if WKWebView is supported.
 bool UseWKWebView() {
-#if defined(FORCE_ENABLE_WKWEBVIEW)
   return web::IsWKWebViewSupported();
-#else
-  return false;
-#endif
 }
 }