[ios] Use new JS execution API for Autofill.

components/autofill/ios/browser/js_autofill_manager.mm

 // Copyright 2013 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 "components/autofill/ios/browser/js_autofill_manager.h"
 
 #include "base/format_macros.h"
 #include "base/json/string_escape.h"
 #include "base/logging.h"
+#include "base/mac/foundation_util.h"
 
 @implementation JsAutofillManager
 
 - (void)fetchFormsWithMinimumRequiredFieldsCount:(NSUInteger)requiredFieldsCount
                                completionHandler:
                                    (void (^)(NSString*))completionHandler {
   DCHECK(completionHandler);
   NSString* extractFormsJS = [NSString
       stringWithFormat:@"__gCrWeb.autofill.extractForms(%" PRIuNS ");",
                        requiredFieldsCount];
-  [self evaluate:extractFormsJS
-      stringResultHandler:^(NSString* result, NSError*) {
-        completionHandler(result);
-      }];
+  [self executeJavaScript:extractFormsJS
+        completionHandler:^(id result, NSError*) {
+          completionHandler(base::mac::ObjCCastStrict<NSString>(result));
+        }];
 }
 
 #pragma mark -
 #pragma mark ProtectedMethods
 
 - (NSString*)scriptPath {
   return @"autofill_controller";
 }
 
 - (void)fillActiveFormField:(NSString*)dataString
           completionHandler:(ProceduralBlock)completionHandler {
-  web::JavaScriptCompletion resultHandler = ^void(NSString*, NSError*) {
-    completionHandler();
-  };
-
-  NSString* js =
+  NSString* script =
       [NSString stringWithFormat:@"__gCrWeb.autofill.fillActiveFormField(%@);",
                                  dataString];
-  [self evaluate:js stringResultHandler:resultHandler];
+  [self executeJavaScript:script completionHandler:^(id, NSError*) {
+    completionHandler();
+  }];
 }
 
 - (void)fillForm:(NSString*)dataString
     forceFillFieldName:(NSString*)forceFillFieldName
      completionHandler:(ProceduralBlock)completionHandler {
   DCHECK(completionHandler);
   std::string fieldName =
       forceFillFieldName
           ? base::GetQuotedJSONString([forceFillFieldName UTF8String])
           : "null";
   NSString* fillFormJS =
       [NSString stringWithFormat:@"__gCrWeb.autofill.fillForm(%@, %s);",
                                  dataString, fieldName.c_str()];
-  id stringResultHandler = ^(NSString*, NSError*) {
+  [self executeJavaScript:fillFormJS completionHandler:^(id, NSError*) {
     completionHandler();
-  };
-  return [self evaluate:fillFormJS stringResultHandler:stringResultHandler];
+  }];
 }
 
 - (void)clearAutofilledFieldsForFormNamed:(NSString*)formName
                         completionHandler:(ProceduralBlock)completionHandler {
   DCHECK(completionHandler);
-  web::JavaScriptCompletion resultHandler = ^void(NSString*, NSError*) {
-    completionHandler();
-  };
-
-  NSString* js =
+  NSString* script =
       [NSString stringWithFormat:
                     @"__gCrWeb.autofill.clearAutofilledFields(%s);",
                     base::GetQuotedJSONString([formName UTF8String]).c_str()];
-  [self evaluate:js stringResultHandler:resultHandler];
+  [self executeJavaScript:script completionHandler:^(id, NSError*) {
+    completionHandler();
+  }];
 }
 
 - (void)fillPredictionData:(NSString*)dataString {
   NSString* script =
       [NSString stringWithFormat:@"__gCrWeb.autofill.fillPredictionData(%@);",
                                  dataString];
   [self executeJavaScript:script completionHandler:nil];
 }
 
 @end