Remove ios/web/public/block_types.h

This header has a single typedef of a block which is mostly used in deprecated files. Typedef itself does not make code more readable, because the type name does not convey any information about block return type and arguments. Per Style Guide the code should be optimized for reader, not for writer: http://go/objc-style#optimize-for-the-reader-not-the-writer Bug: 942244 Change-Id: I9fcd09a2a990e32450f98ec55455508bf919a72b Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1527208 Commit-Queue: Mike Dougherty <michaeldo@chromium.org> Auto-Submit: Eugene But <eugenebut@chromium.org> Reviewed-by: Mike Dougherty <michaeldo@chromium.org> Cr-Commit-Position: refs/heads/master@{#642071}
Denger-Network · Mar 19, 2019 · 8f18c40 · 8f18c40
1 parent 1f97a46
commit 8f18c40
Show file tree

Hide file tree

Showing 22 changed files with 28 additions and 55 deletions.
diff --git a/ios/chrome/browser/ui/browser_view_controller.mm b/ios/chrome/browser/ui/browser_view_controller.mm
@@ -4186,7 +4186,7 @@ - (void)viewSource {
   NSString* script = @"document.documentElement.outerHTML;";
   __weak Tab* weakTab = tab;
   __weak BrowserViewController* weakSelf = self;
-  web::JavaScriptResultBlock completionHandlerBlock = ^(id result, NSError*) {
+  auto completionHandlerBlock = ^(id result, NSError*) {
     Tab* strongTab = weakTab;
     if (!strongTab)
       return;

diff --git a/ios/chrome/browser/ui/static_content/static_html_native_content.mm b/ios/chrome/browser/ui/static_content/static_html_native_content.mm
@@ -127,7 +127,7 @@ - (BOOL)isViewAlive {
 }
 
 - (void)executeJavaScript:(NSString*)script
-        completionHandler:(web::JavaScriptResultBlock)handler {
+        completionHandler:(void (^)(id, NSError*))handler {
   [_staticHTMLViewController executeJavaScript:script
                              completionHandler:handler];
 }

diff --git a/ios/chrome/browser/ui/static_content/static_html_view_controller.h b/ios/chrome/browser/ui/static_content/static_html_view_controller.h
@@ -8,7 +8,6 @@
 #import <UIKit/UIKit.h>
 #import <WebKit/WebKit.h>
 
-#import "ios/web/public/block_types.h"
 #include "url/gurl.h"
 
 @protocol CRWNativeContentDelegate;
@@ -82,7 +81,7 @@ typedef void (^HtmlCallback)(NSString*);
 // moment, |completionHandler| is called with an NSError. The
 // |completionHandler| can be nil.
 - (void)executeJavaScript:(NSString*)script
-        completionHandler:(web::JavaScriptResultBlock)completionHandler;
+        completionHandler:(void (^)(id, NSError*))completionHandler;
 
 // The web page title. Will return nil if not available.
 - (NSString*)title;

diff --git a/ios/chrome/browser/ui/static_content/static_html_view_controller.mm b/ios/chrome/browser/ui/static_content/static_html_view_controller.mm
@@ -135,7 +135,7 @@ - (void)dealloc {
 }
 
 - (void)executeJavaScript:(NSString*)script
-        completionHandler:(web::JavaScriptResultBlock)handler {
+        completionHandler:(void (^)(id, NSError*))handler {
   [webView_ evaluateJavaScript:script completionHandler:handler];
 }
 

diff --git a/ios/chrome/test/earl_grey/chrome_matchers.mm b/ios/chrome/test/earl_grey/chrome_matchers.mm
@@ -36,7 +36,6 @@
 #import "ios/chrome/browser/ui/util/uikit_ui_util.h"
 #include "ios/chrome/grit/ios_strings.h"
 #import "ios/chrome/test/app/chrome_test_util.h"
-#import "ios/web/public/block_types.h"
 #import "ios/web/public/test/earl_grey/web_view_matchers.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/test/ios/ui_image_test_utils.h"

diff --git a/ios/web/interstitials/web_interstitial_impl.h b/ios/web/interstitials/web_interstitial_impl.h
@@ -27,7 +27,7 @@ class WebStateImpl;
 // has access to private ExecuteJavaScript method to be used for testing.
 void ExecuteScriptForTesting(WebInterstitialImpl*,
                              NSString*,
-                             JavaScriptResultBlock);
+                             void (^)(id, NSError*));
 
 // An abstract subclass of WebInterstitial that exposes the views necessary to
 // embed the interstitial into a WebState.
@@ -63,7 +63,7 @@ class WebInterstitialImpl : public WebInterstitial, public WebStateObserver {
   // Calls |completionHandler| with results of the evaluation.
   // The |completionHandler| can be nil. Must be used only for testing.
   virtual void ExecuteJavaScript(NSString* script,
-                                 JavaScriptResultBlock completion_handler);
+                                 void (^completion_handler)(id, NSError*));
 
  private:
   // The WebState this instance is observing. Will be null after
@@ -91,9 +91,10 @@ class WebInterstitialImpl : public WebInterstitial, public WebStateObserver {
   CRWContentView* content_view_;
 
   // Must be implemented only for testing purposes.
-  friend void web::ExecuteScriptForTesting(WebInterstitialImpl*,
-                                           NSString*,
-                                           JavaScriptResultBlock);
+  friend void web::ExecuteScriptForTesting(
+      WebInterstitialImpl*,
+      NSString*,
+      void (^completion_handler)(id, NSError*));
 };
 
 }  // namespace web

diff --git a/ios/web/interstitials/web_interstitial_impl.mm b/ios/web/interstitials/web_interstitial_impl.mm
@@ -189,7 +189,7 @@ - (void)webView:(WKWebView*)webView
 
 void WebInterstitialImpl::ExecuteJavaScript(
     NSString* script,
-    JavaScriptResultBlock completion_handler) {
+    void (^completion_handler)(id, NSError*)) {
   web::ExecuteJavaScript(web_view_, script, completion_handler);
 }
 

diff --git a/ios/web/public/BUILD.gn b/ios/web/public/BUILD.gn
@@ -19,7 +19,6 @@ source_set("public") {
   ]
 
   sources = [
-    "block_types.h",
     "browser_state.h",
     "browser_url_rewriter.h",
     "browsing_data_removing_util.h",

diff --git a/ios/web/public/block_types.h b/ios/web/public/block_types.h
diff --git a/ios/web/public/test/earl_grey/js_test_util.mm b/ios/web/public/test/earl_grey/js_test_util.mm
@@ -24,7 +24,7 @@
 // Evaluates the given |script| on |interstitial|.
 void ExecuteScriptForTesting(web::WebInterstitialImpl* interstitial,
                              NSString* script,
-                             web::JavaScriptResultBlock handler) {
+                             void (^handler)(id result, NSError*)) {
   DCHECK(interstitial);
   interstitial->ExecuteJavaScript(script, handler);
 }

diff --git a/ios/web/public/test/fakes/crw_test_js_injection_receiver.mm b/ios/web/public/test/fakes/crw_test_js_injection_receiver.mm
@@ -33,7 +33,7 @@ - (instancetype)init {
 }
 
 - (void)executeJavaScript:(NSString*)script
-        completionHandler:(web::JavaScriptResultBlock)completionHandler {
+        completionHandler:(void (^)(id, NSError*))completionHandler {
   web::ExecuteJavaScript(_webView, script, completionHandler);
 }
 

diff --git a/ios/web/public/web_state/js/crw_js_injection_evaluator.h b/ios/web/public/web_state/js/crw_js_injection_evaluator.h
@@ -7,16 +7,14 @@
 
 #import <Foundation/Foundation.h>
 
-#import "ios/web/public/block_types.h"
-
 @protocol CRWJSInjectionEvaluator
 
 // Executes the supplied JavaScript in the WebView. Calls |completionHandler|
 // with results of the execution (which may be nil if the implementing object
 // has no way to run the execution or the execution returns a nil value)
 // or an NSError if there is an error. The |completionHandler| can be nil.
 - (void)executeJavaScript:(NSString*)script
-        completionHandler:(web::JavaScriptResultBlock)completionHandler;
+        completionHandler:(void (^)(id, NSError*))completionHandler;
 
 // Checks to see if the script for a class has been injected into the
 // current page already.

diff --git a/ios/web/public/web_state/js/crw_js_injection_manager.h b/ios/web/public/web_state/js/crw_js_injection_manager.h
@@ -29,7 +29,7 @@
 // with results of the execution (which may be nil) or an NSError if there is an
 // error. The |completionHandler| can be nil.
 - (void)executeJavaScript:(NSString*)script
-        completionHandler:(web::JavaScriptResultBlock)completionHandler;
+        completionHandler:(void (^)(id, NSError*))completionHandler;
 
 @end
 

diff --git a/ios/web/public/web_state/ui/crw_native_content.h b/ios/web/public/web_state/ui/crw_native_content.h
@@ -7,7 +7,6 @@
 
 #import <UIKit/UIKit.h>
 
-#import "ios/web/public/block_types.h"
 #include "url/gurl.h"
 
 namespace web {
@@ -54,7 +53,7 @@ struct ContextMenuParams;
 // of the evaluation. If the native view cannot evaluate JS at the moment,
 // |handler| is called with an NSError.
 - (void)executeJavaScript:(NSString*)script
-        completionHandler:(web::JavaScriptResultBlock)handler;
+        completionHandler:(void (^)(id, NSError*))handler;
 
 // Dismisses any outstanding modal interaction elements (e.g. modal view
 // controllers, context menus, etc).

diff --git a/ios/web/web_state/js/crw_js_injection_manager.mm b/ios/web/web_state/js/crw_js_injection_manager.mm
@@ -59,7 +59,7 @@ - (void)lowMemoryWarning:(NSNotification*)notify {
 }
 
 - (void)executeJavaScript:(NSString*)script
-        completionHandler:(web::JavaScriptResultBlock)completionHandler {
+        completionHandler:(void (^)(id, NSError*))completionHandler {
   [_receiver executeJavaScript:script completionHandler:completionHandler];
 }
 

diff --git a/ios/web/web_state/js/crw_js_injection_receiver.mm b/ios/web/web_state/js/crw_js_injection_receiver.mm
@@ -35,7 +35,7 @@ - (id)initWithEvaluator:(id<CRWJSInjectionEvaluator>)evaluator {
 #pragma mark CRWJSInjectionEvaluatorMethods
 
 - (void)executeJavaScript:(NSString*)script
-        completionHandler:(web::JavaScriptResultBlock)completionHandler {
+        completionHandler:(void (^)(id, NSError*))completionHandler {
   [_evaluator executeJavaScript:script completionHandler:completionHandler];
 }
 

diff --git a/ios/web/web_state/ui/crw_context_menu_controller.h b/ios/web/web_state/ui/crw_context_menu_controller.h
@@ -8,8 +8,6 @@
 #import <Foundation/Foundation.h>
 #import <WebKit/WebKit.h>
 
-#import "ios/web/public/block_types.h"
-
 namespace web {
 class BrowserState;
 }  // namespace web

diff --git a/ios/web/web_state/ui/crw_context_menu_controller.mm b/ios/web/web_state/ui/crw_context_menu_controller.mm
@@ -139,7 +139,7 @@ - (void)cancelContextMenuDisplay;
 // Forwards the execution of |script| to |javaScriptDelegate| and if it is nil,
 // to |webView|.
 - (void)executeJavaScript:(NSString*)script
-        completionHandler:(web::JavaScriptResultBlock)completionHandler;
+        completionHandler:(void (^)(id, NSError*))completionHandler;
 @end
 
 @implementation CRWContextMenuController {
@@ -258,7 +258,7 @@ - (CGPoint)scrollPosition {
 }
 
 - (void)executeJavaScript:(NSString*)script
-        completionHandler:(web::JavaScriptResultBlock)completionHandler {
+        completionHandler:(void (^)(id, NSError*))completionHandler {
   if (self.injectionEvaluator) {
     [self.injectionEvaluator executeJavaScript:script
                              completionHandler:completionHandler];

diff --git a/ios/web/web_state/ui/crw_web_controller.h b/ios/web/web_state/ui/crw_web_controller.h
@@ -179,8 +179,11 @@ class WebStateImpl;
 - (void)stopLoading;
 
 // Executes |script| in the web view, registering user interaction.
+// |result| will be backed up by different classes depending on resulting JS
+// type: NSString (string), NSNumber (number or boolean), NSDictionary (object),
+// NSArray (array), NSNull (null), NSDate (Date), nil (undefined).
 - (void)executeUserJavaScript:(NSString*)script
-            completionHandler:(web::JavaScriptResultBlock)completion;
+            completionHandler:(void (^)(id result, NSError*))completion;
 
 // Requires that the next load rebuild the web view. This is expensive, and
 // should be used only in the case where something has changed that the web view

diff --git a/ios/web/web_state/ui/crw_web_controller.mm b/ios/web/web_state/ui/crw_web_controller.mm
@@ -1399,7 +1399,7 @@ - (void)loadHTML:(NSString*)HTML forURL:(const GURL&)URL {
 }
 
 - (void)executeUserJavaScript:(NSString*)script
-            completionHandler:(web::JavaScriptResultBlock)completion {
+            completionHandler:(void (^)(id, NSError*))completion {
   // For security reasons, executing JavaScript on pages with app-specific URLs
   // is not allowed, because those pages may have elevated privileges.
   GURL lastCommittedURL = self.webState->GetLastCommittedURL();
@@ -1580,7 +1580,7 @@ - (void)takeSnapshotWithRect:(CGRect)rect
 #pragma mark - CRWJSInjectionEvaluator (Public)
 
 - (void)executeJavaScript:(NSString*)script
-        completionHandler:(web::JavaScriptResultBlock)completionHandler {
+        completionHandler:(void (^)(id, NSError*))completionHandler {
   NSString* safeScript = [self scriptByAddingWindowIDCheckForScript:script];
   web::ExecuteJavaScript(self.webView, safeScript, completionHandler);
 }

diff --git a/ios/web/web_state/ui/web_view_js_utils.h b/ios/web/web_state/ui/web_view_js_utils.h
@@ -8,8 +8,6 @@
 #import <Foundation/Foundation.h>
 #include <memory>
 
-#import "ios/web/public/block_types.h"
-
 @class WKWebView;
 
 namespace base {
@@ -39,7 +37,7 @@ std::unique_ptr<base::Value> ValueResultFromWKResult(id result);
 // moment, |completion_handler| is called with an NSError.
 void ExecuteJavaScript(WKWebView* web_view,
                        NSString* script,
-                       JavaScriptResultBlock completion_handler);
+                       void (^completion_handler)(id, NSError*));
 
 }  // namespace web
 

diff --git a/ios/web/web_state/ui/web_view_js_utils.mm b/ios/web/web_state/ui/web_view_js_utils.mm
@@ -87,7 +87,7 @@
 
 void ExecuteJavaScript(WKWebView* web_view,
                        NSString* script,
-                       JavaScriptResultBlock completion_handler) {
+                       void (^completion_handler)(id, NSError*)) {
   DCHECK([script length]);
   if (!web_view && completion_handler) {
     dispatch_async(dispatch_get_main_queue(), ^{