Convert base::Bind in MockAndroidOverlay

Update base::Bind -> base::BindRepeating for mock callbacks in
MockAndroidOverlay. Also removes the ControlCallback type alias in favor
of base::RepeatingClosure.

BUG=1007799

Change-Id: I9a6594c83ef0d119964735277e3bfe53fbcee029
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2282897
Auto-Submit: Matt Reynolds <mattreynolds@chromium.org>
Reviewed-by: Chrome Cunningham <chcunningham@chromium.org>
Commit-Queue: Chrome Cunningham <chcunningham@chromium.org>
Cr-Commit-Position: refs/heads/master@{#786035}

media/base/android/mock_android_overlay.cc

@@ -25,14 +25,14 @@ void MockAndroidOverlay::SetConfig(AndroidOverlayConfig config) {
 
 MockAndroidOverlay::Callbacks MockAndroidOverlay::GetCallbacks() {
   Callbacks c;
-  c.OverlayReady = base::Bind(&MockAndroidOverlay::OnOverlayReady,
-                              weak_factory_.GetWeakPtr());
-  c.OverlayFailed = base::Bind(&MockAndroidOverlay::OnOverlayFailed,
-                               weak_factory_.GetWeakPtr());
-  c.SurfaceDestroyed = base::Bind(&MockAndroidOverlay::OnSurfaceDestroyed,
-                                  weak_factory_.GetWeakPtr());
-  c.PowerEfficientState = base::Bind(&MockAndroidOverlay::OnPowerEfficientState,
-                                     weak_factory_.GetWeakPtr());
+  c.OverlayReady = base::BindRepeating(&MockAndroidOverlay::OnOverlayReady,
+                                       weak_factory_.GetWeakPtr());
+  c.OverlayFailed = base::BindRepeating(&MockAndroidOverlay::OnOverlayFailed,
+                                        weak_factory_.GetWeakPtr());
+  c.SurfaceDestroyed = base::BindRepeating(
+      &MockAndroidOverlay::OnSurfaceDestroyed, weak_factory_.GetWeakPtr());
+  c.PowerEfficientState = base::BindRepeating(
+      &MockAndroidOverlay::OnPowerEfficientState, weak_factory_.GetWeakPtr());
 
   return c;
 }

media/base/android/mock_android_overlay.h

@@ -33,16 +33,15 @@ class MockAndroidOverlay : public testing::NiceMock<AndroidOverlay>,
   AndroidOverlayConfig* config() const { return config_.get(); }
 
   // Set of callbacks that we provide to control the overlay once you've handed
-  // off ownership of it.  Will return false if the overlay has been destroyed.
-  using ControlCallback = base::RepeatingCallback<void()>;
+  // off ownership of it.
   struct Callbacks {
     Callbacks();
     Callbacks(const Callbacks&);
     ~Callbacks();
 
-    ControlCallback OverlayReady;
-    ControlCallback OverlayFailed;
-    ControlCallback SurfaceDestroyed;
+    base::RepeatingClosure OverlayReady;
+    base::RepeatingClosure OverlayFailed;
+    base::RepeatingClosure SurfaceDestroyed;
     base::RepeatingCallback<void(bool)> PowerEfficientState;
   };