Removing StaticFileWebView vending methods.

ios/web/web_state/web_view_internal_creation_util.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/web_view_internal_creation_util.h"
 
 #import <objc/runtime.h>
 #import <WebKit/WebKit.h>
 
 #include "base/logging.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #import "ios/web/alloc_with_zone_interceptor.h"
 #include "ios/web/public/active_state_manager.h"
 #include "ios/web/public/browser_state.h"
 #import "ios/web/public/browsing_data_partition.h"
 #include "ios/web/public/web_client.h"
 #import "ios/web/public/web_view_counter.h"
 #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"

[Eugene But (OOO till 7-30), 2016/03/14 22:52:45]

Do you still need this include?

[shreyasv1, 2016/03/14 22:54:16]

Good catch. Done.

 #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"
 
 #if !defined(NDEBUG)
 
 namespace {
 // Returns the counter of all the active WKWebViews.
 // DEPRECATED. Please use web::WebViewCounter instead.
 // TODO(shreyasv): Remove this once all callers have stopped using it.
@@ skipping 154 matching lines @@
   // This should not be used in release builds.
   CHECK(0);
   return 0;
 #else
   return GetActiveWKWebViewCounter().Size();
 #endif
 }
 
 id<CRWSimpleWebViewController> CreateSimpleWebViewController(
     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) {
-    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) {
-  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)
 bool IsWebViewAllocInitAllowed() {
   static dispatch_once_t once_token = 0;
   dispatch_once(&once_token, ^{
     DCHECK(GetWebClient());
     gAllowWebViewCreation = GetWebClient()->AllowWebViewAllocInit();
     if (!gAllowWebViewCreation) {
       gWebViewsNeedActiveStateManager =
           GetWebClient()->WebViewsNeedActiveStateManager();
     }
   });
   return gAllowWebViewCreation;
 }
 #endif
 
 }  // namespace web