[ios] Removed UIWebView JS evaluation code.

ios/web/web_state/ui/web_view_js_utils.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/web_view_js_utils.h"
 
-#import <UIKit/UIKit.h>
+#include <CoreFoundation/CoreFoundation.h>
 #import <WebKit/WebKit.h>
 
-#include "base/ios/weak_nsobject.h"
 #include "base/logging.h"
 #include "base/mac/scoped_nsobject.h"
 
 namespace {
 
-// Converts result of WKWebView script evaluation to UIWebView format.
-NSString* UIResultFromWKResult(id result) {
+// Converts result of WKWebView script evaluation to a string.
+NSString* StringResultFromWKResult(id result) {

[Jackie Quinn, 2016/03/17 17:06:43]

Are we planning on making it so that we don't convert to string? If so, maybe
file a bug and add a TODO.

[Eugene But (OOO till 7-30), 2016/03/17 17:19:14]

Web Controller will not be used as public API. WebState currently does not have
API to evaluate JS with callback, so if we add it, then maybe we'll make it
return |id| or even |base::Value|. I added TODO in JSInjectionEvaluator.

   if (!result)
     return @"";
 
   CFTypeID result_type = CFGetTypeID(result);
   if (result_type == CFStringGetTypeID())
     return result;
 
   if (result_type == CFNumberGetTypeID())
     return [result stringValue];
 
   if (result_type == CFBooleanGetTypeID())
     return [result boolValue] ? @"true" : @"false";
 
   if (result_type == CFNullGetTypeID())
     return @"";
 
   // TODO(stuartmorgan): Stringify other types.
   NOTREACHED();
   return nil;
 }
 
 }  // namespace
 
 namespace web {
 
 NSString* const kJSEvaluationErrorDomain = @"JSEvaluationError";
 
-void EvaluateJavaScript(UIWebView* web_view,
-                        NSString* script,
-                        JavaScriptCompletion completion_handler) {
-  base::WeakNSObject<UIWebView> weak_web_view(web_view);
-  dispatch_async(dispatch_get_main_queue(), ^{
-    NSString* result =
-        [weak_web_view stringByEvaluatingJavaScriptFromString:script];
-    if (completion_handler)
-      completion_handler(result, nil);
-  });
-}
-
 void EvaluateJavaScript(WKWebView* web_view,
                         NSString* script,
                         JavaScriptCompletion completion_handler) {
   DCHECK([script length]);
   if (!web_view && completion_handler) {
     dispatch_async(dispatch_get_main_queue(), ^{
       NSString* error_message =
           @"JS evaluation failed because there is no web view.";
       base::scoped_nsobject<NSError> error([[NSError alloc]
           initWithDomain:kJSEvaluationErrorDomain
                     code:JS_EVALUATION_ERROR_CODE_NO_WEB_VIEW
                 userInfo:@{NSLocalizedDescriptionKey : error_message}]);
       completion_handler(nil, error);
     });
     return;
   }
 
   void (^web_view_completion_handler)(id, NSError*) = nil;
   // Do not create a web_view_completion_handler if no |completion_handler| is
   // passed to this function. WKWebView guarantees to call all completion
   // handlers before deallocation. Passing nil as completion handler (when
   // appropriate) may speed up web view deallocation, because there will be no
   // need to call those completion handlers.
   if (completion_handler) {
     web_view_completion_handler = ^(id result, NSError* error) {
-      completion_handler(UIResultFromWKResult(result), error);
+      completion_handler(StringResultFromWKResult(result), error);
     };
   }
   [web_view evaluateJavaScript:script
              completionHandler:web_view_completion_handler];
 }
 
 }  // namespace web