Convert ui/ to use Bind() for blocks

With https://crrev.com/c/1070158, base::Bind() supports
block via base::RetainBlock(). Converts uses of the now
deprecated base::BindBlock().

Bug: 701275
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Change-Id: I103584b54f656f10e17c8e2439e0520c7690dbfe
Reviewed-on: https://chromium-review.googlesource.com/1090912Reviewed-by: Avi Drissman <avi@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#565956}

ui/base/cocoa/menu_controller.mm

@@ -4,9 +4,9 @@
 
 #import "ui/base/cocoa/menu_controller.h"
 
+#include "base/bind.h"
 #include "base/cancelable_callback.h"
 #include "base/logging.h"
-#include "base/mac/bind_objc_block.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "ui/base/accelerators/accelerator.h"
@@ -262,8 +262,8 @@ NSString* const kMenuControllerMenuDidCloseNotification =
     // likely if the -cancel happens in the delegate method.
     NSMenu* menu = menu_;
 
-    postedItemSelectedTask_ =
-        std::make_unique<base::CancelableClosure>(base::BindBlock(^{
+    postedItemSelectedTask_ = std::make_unique<base::CancelableClosure>(
+        base::BindRepeating(base::RetainBlock(^{
           id target = [sender target];
           if ([target respondsToSelector:@selector(itemSelected:uiEventFlags:)])
             [target itemSelected:sender uiEventFlags:uiEventFlags];
@@ -276,7 +276,7 @@ NSString* const kMenuControllerMenuDidCloseNotification =
           // the target can not be set to nil here since that prevents re-use of
           // the menu for well-behaved consumers.
           CHECK([menu delegate]);  // Note: set to nil in -dealloc.
-        }));
+        })));
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE, postedItemSelectedTask_->callback());
   }

ui/gl/gl_image_io_surface.mm

@@ -6,8 +6,8 @@
 
 #include <map>
 
+#include "base/bind.h"
 #include "base/callback_helpers.h"
-#include "base/mac/bind_objc_block.h"
 #include "base/mac/foundation_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/trace_event/memory_allocator_dump.h"
@@ -346,9 +346,10 @@ bool GLImageIOSurface::CopyTexImage(unsigned target) {
       return false;
   }
   glGetIntegerv(target_getter, &rgb_texture);
-  base::ScopedClosureRunner destroy_resources_runner(base::BindBlock(^{
-    glBindTexture(target, rgb_texture);
-  }));
+  base::ScopedClosureRunner destroy_resources_runner(
+      base::BindOnce(base::RetainBlock(^{
+        glBindTexture(target, rgb_texture);
+      })));
 
   CGLContextObj cgl_context = CGLGetCurrentContext();
   {

ui/gl/gl_image_io_surface_egl.mm

@@ -4,8 +4,8 @@
 
 #include "ui/gl/gl_image_io_surface_egl.h"
 
+#include "base/bind.h"
 #include "base/callback_helpers.h"
-#include "base/mac/bind_objc_block.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_surface_egl.h"
 #include "ui/gl/scoped_binders.h"
@@ -196,23 +196,24 @@ bool GLImageIOSurfaceEGL::CopyTexImage(unsigned target) {
   EGLSurface uv_surface = EGL_NO_SURFACE;
 
   glGetIntegerv(target_getter, &rgb_texture);
-  base::ScopedClosureRunner destroy_resources_runner(base::BindBlock(^{
-    if (y_surface != EGL_NO_SURFACE) {
-      EGLBoolean result =
-          eglReleaseTexImage(display_, y_surface, EGL_BACK_BUFFER);
-      DCHECK(result == EGL_TRUE);
-      result = eglDestroySurface(display_, y_surface);
-      DCHECK(result == EGL_TRUE);
-    }
-    if (uv_surface != EGL_NO_SURFACE) {
-      EGLBoolean result =
-          eglReleaseTexImage(display_, uv_surface, EGL_BACK_BUFFER);
-      DCHECK(result == EGL_TRUE);
-      result = eglDestroySurface(display_, uv_surface);
-      DCHECK(result == EGL_TRUE);
-    }
-    glBindTexture(target, rgb_texture);
-  }));
+  base::ScopedClosureRunner destroy_resources_runner(
+      base::BindOnce(base::RetainBlock(^{
+        if (y_surface != EGL_NO_SURFACE) {
+          EGLBoolean result =
+              eglReleaseTexImage(display_, y_surface, EGL_BACK_BUFFER);
+          DCHECK(result == EGL_TRUE);
+          result = eglDestroySurface(display_, y_surface);
+          DCHECK(result == EGL_TRUE);
+        }
+        if (uv_surface != EGL_NO_SURFACE) {
+          EGLBoolean result =
+              eglReleaseTexImage(display_, uv_surface, EGL_BACK_BUFFER);
+          DCHECK(result == EGL_TRUE);
+          result = eglDestroySurface(display_, uv_surface);
+          DCHECK(result == EGL_TRUE);
+        }
+        glBindTexture(target, rgb_texture);
+      })));
 
   glBindTexture(GL_TEXTURE_RECTANGLE_ARB, yuv_to_rgb_converter->y_texture());
   if (glGetError() != GL_NO_ERROR) {

ui/views/cocoa/views_nswindow_delegate.mm

@@ -4,8 +4,8 @@
 
 #import "ui/views/cocoa/views_nswindow_delegate.h"
 
+#include "base/bind.h"
 #include "base/logging.h"
-#import "base/mac/bind_objc_block.h"
 #include "base/threading/thread_task_runner_handle.h"
 #import "ui/views/cocoa/bridged_content_view.h"
 #import "ui/views/cocoa/bridged_native_widget.h"
@@ -117,10 +117,12 @@
     // NSWindow delegate, the call to -[NSApp beginSheet:] also took a weak
     // reference to the delegate, which will be destroyed when the sheet's
     // BridgedNativeWidget is destroyed.
-    base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, base::BindBlock(^{
-      [sheetParent endSheet:window];
-      [[self retain] release];  // Force |self| to be retained for the block.
-    }));
+    base::ThreadTaskRunnerHandle::Get()->PostTask(
+        FROM_HERE, base::BindOnce(base::RetainBlock(^{
+          [sheetParent endSheet:window];
+          [[self retain]
+              release];  // Force |self| to be retained for the block.
+        })));
   }
   DCHECK([window isEqual:[notification object]]);
   parent_->OnWindowWillClose();

ui/views/widget/native_widget_mac.mm

@@ -8,8 +8,8 @@
 
 #include <utility>
 
+#include "base/bind.h"
 #include "base/command_line.h"
-#import "base/mac/bind_objc_block.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
@@ -416,9 +416,10 @@ void NativeWidgetMac::Close() {
   // Many tests assume that base::RunLoop().RunUntilIdle() is always sufficient
   // to execute a close. However, in rare cases, -performSelector:..afterDelay:0
   // does not do this. So post a regular task.
-  base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, base::BindBlock(^{
-    [window close];
-  }));
+  base::ThreadTaskRunnerHandle::Get()->PostTask(
+      FROM_HERE, base::BindOnce(base::RetainBlock(^{
+        [window close];
+      })));
 }
 
 void NativeWidgetMac::CloseNow() {