Removing StaticFileWebView vending methods.

Not needed anymore.

Moved one existing caller crw_url_verifying_protocol_handler
to instead use a plain UIWebView.

Also, removed the web_view_type param from
CreateSimpleWebViewController

BUG=579697

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

Cr-Commit-Position: refs/heads/master@{#381319}

3 files changed, 6 insertions, 100 deletions

diff --git a/ios/web/web_state/web_view_internal_creation_util.h b/ios/web/web_state/web_view_internal_creation_util.h
index 0c8235b..74b0c2d 100644
--- a/ios/web/web_state/web_view_internal_creation_util.h
+++ b/ios/web/web_state/web_view_internal_creation_util.h
@@ -7,8 +7,6 @@
 
 #import <UIKit/UIKit.h>
 
-#include "ios/web/public/web_view_type.h"
-
 @protocol CRWSimpleWebViewController;
 @class WKWebView;
 @class WKWebViewConfiguration;
@@ -63,43 +61,10 @@ WKWebView* CreateWKWebView(CGRect frame,
 NSUInteger GetActiveWKWebViewsCount();
 
 // Returns a CRWSimpleWebViewController for managing/showing a web view.
-// The BrowsingDataPartition must be synchronized before this method is called.
 // Note: Callers are responsible for releasing the CRWSimpleWebViewController.
-// DEPRECATED: The usage of |WebViewType| param is deprecated.
-// TODO(crbug.com/579697): By default the controller is backed by a WKWebView.
-// Remove the |WebViewType| param once all clients have stopped using it.
 id<CRWSimpleWebViewController> CreateSimpleWebViewController(
     CGRect frame,
-    BrowserState* browser_state,
-    WebViewType web_view_type = WK_WEB_VIEW_TYPE);
-
-// Returns a new CRWSimpleWebViewController subclass displaying static HTML file
-// content stored in the application bundle.
-// The BrowsingDataPartition must be synchronized before this method is called.
-// Note: Callers are responsible for releasing the returned ViewController.
-// TODO(crbug.com/579697): By default the controller is backed by a WKWebView.
-// Remove the |WebViewType| param once all clients have stopped using it.
-id<CRWSimpleWebViewController> CreateStaticFileSimpleWebViewController(
-    CGRect frame,
-    BrowserState* browser_state,
-    WebViewType web_view_type = WK_WEB_VIEW_TYPE);
-
-// Returns a new UIWebView subclass for displaying static HTML file content
-// stored in the application bundle. if |browser_state| is nullptr, requests
-// from the returned UIWebView will be done with global request context. When
-// requests are made with global request context, requests such as file://
-// will fail.
-// Note: Callers are responsible for releasing the returned UIWebView.
-// DEPRECATED: Please use the |CreateStaticFileSimpleWebViewController|
-// equivalent instead.
-UIWebView* CreateStaticFileWebView(CGRect frame, BrowserState* browser_state);
-
-// A convenience method that returns a static file web view with
-// CGRectZero and |nullptr| browser state.
-// Note: Callers are responsible for releasing the returned UIWebView.
-// DEPRECATED: Please use the |CreateStaticFileSimpleWebViewController|
-// equivalent instead.
-UIWebView* CreateStaticFileWebView();
+    BrowserState* browser_state);
 
 #if !defined(NDEBUG)
 // Returns true if the creation of web views using alloc, init has been allowed
diff --git a/ios/web/web_state/web_view_internal_creation_util.mm b/ios/web/web_state/web_view_internal_creation_util.mm
index cde2176..000da7d 100644
--- a/ios/web/web_state/web_view_internal_creation_util.mm
+++ b/ios/web/web_state/web_view_internal_creation_util.mm
@@ -19,8 +19,6 @@
 #import "ios/web/public/web_view_creation_util.h"
 #include "ios/web/ui_web_view_util.h"
 #import "ios/web/weak_nsobject_counter.h"
-#import "ios/web/web_state/ui/crw_static_file_web_view.h"
-#import "ios/web/web_state/ui/crw_ui_simple_web_view_controller.h"
 #import "ios/web/web_state/ui/crw_wk_simple_web_view_controller.h"
 #import "ios/web/web_state/ui/wk_web_view_configuration_provider.h"
 #import "ios/web/web_view_counter_impl.h"
@@ -195,51 +193,11 @@ NSUInteger GetActiveWKWebViewsCount() {
 
 id<CRWSimpleWebViewController> CreateSimpleWebViewController(
     CGRect frame,
-    BrowserState* browser_state,
-    WebViewType web_view_type) {
-  DCHECK(web::BrowsingDataPartition::IsSynchronized());
-
-  // Transparently return the correct subclass.
-  if (web_view_type == WK_WEB_VIEW_TYPE) {
-    base::scoped_nsobject<WKWebView> web_view(
-        web::CreateWKWebView(frame, browser_state));
-    return [[CRWWKSimpleWebViewController alloc] initWithWKWebView:web_view];
-  }
-  base::scoped_nsobject<UIWebView> web_view(web::CreateWebView(frame));
-  return [[CRWUISimpleWebViewController alloc] initWithUIWebView:web_view];
-}
-
-id<CRWSimpleWebViewController> CreateStaticFileSimpleWebViewController(
-    CGRect frame,
-    BrowserState* browser_state,
-    WebViewType web_view_type) {
+    BrowserState* browser_state) {
   DCHECK(web::BrowsingDataPartition::IsSynchronized());
-
-  // Transparently return the correct subclass.
-  if (web_view_type == WK_WEB_VIEW_TYPE) {
-    // TOOD(shreyasv): Create a new util function vending a WKWebView, wrap that
-    // now return the UIWebView version. crbug.com/403634.
-  }
-  base::scoped_nsobject<UIWebView> staticFileWebView(
-      CreateStaticFileWebView(frame, browser_state));
-  return [[CRWUISimpleWebViewController alloc]
-      initWithUIWebView:staticFileWebView];
-}
-
-UIWebView* CreateStaticFileWebView(CGRect frame, BrowserState* browser_state) {
-  DCHECK(web::GetWebClient());
-  web::GetWebClient()->PreWebViewCreation();
-
-  UIWebView* result =
-      [[CRWStaticFileWebView alloc] initWithFrame:frame
-                                     browserState:browser_state];
-
-  web::GetWebClient()->PostWebViewCreation(result);
-  return result;
-}
-
-UIWebView* CreateStaticFileWebView() {
-  return CreateStaticFileWebView(CGRectZero, nullptr);
+  base::scoped_nsobject<WKWebView> web_view(
+      web::CreateWKWebView(frame, browser_state));
+  return [[CRWWKSimpleWebViewController alloc] initWithWKWebView:web_view];
 }
 
 #if !defined(NDEBUG)
diff --git a/ios/web/web_state/web_view_internal_creation_util_unittest.mm b/ios/web/web_state/web_view_internal_creation_util_unittest.mm
index 6696286..6616a28 100644
--- a/ios/web/web_state/web_view_internal_creation_util_unittest.mm
+++ b/ios/web/web_state/web_view_internal_creation_util_unittest.mm
@@ -182,29 +182,12 @@ TEST_F(WebViewCreationUtilsTest, GetActiveWKWebViewsCount) {
 
 #endif  // defined(NDEBUG)
 
-// Tests web::CreateStaticFileWebView that it correctly returns a
-// CRWStaticFileWebView with the correct frame, user agent, and calls
-// WebClient::PreWebViewCreation/WebClient::PostWebViewCreation methods.
-TEST_F(WebViewCreationUtilsTest, TestNewStaticFileWebViewTrue) {
-  UIWebView* captured_web_view = nil;
-  ExpectWebClientCalls(&captured_web_view);
-
-  base::scoped_nsobject<UIWebView> web_view(
-      CreateStaticFileWebView(kTestFrame, GetBrowserState()));
-  ASSERT_TRUE([web_view isMemberOfClass:[CRWStaticFileWebView class]]);
-  EXPECT_TRUE(CGRectEqualToRect(kTestFrame, [web_view frame]));
-  EXPECT_NSEQ(web_view, captured_web_view);
-
-  NSString* user_agent = GetWebViewUserAgent(web_view);
-  EXPECT_TRUE([CRWStaticFileWebView isStaticFileUserAgent:user_agent]);
-}
-
 // Tests web::CreateSimpleWebViewController returns a CRWSimpleWebViewController
 // instance with a web view.
 TEST_F(WebViewCreationUtilsTest, CreateSimpleWebViewController) {
   base::scoped_nsprotocol<id<CRWSimpleWebViewController>>
       simpleWebViewController(
-          CreateSimpleWebViewController(CGRectZero, nullptr, UI_WEB_VIEW_TYPE));
+          CreateSimpleWebViewController(CGRectZero, GetBrowserState()));
   EXPECT_TRUE([simpleWebViewController view]);
 }