removed AndroidOverlayFactory

media/mojo/clients/mojo_android_overlay.cc

 // Copyright 2017 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.
 
 #include "media/mojo/clients/mojo_android_overlay.h"
 
 #include "services/service_manager/public/cpp/connect.h"
 #include "services/service_manager/public/interfaces/interface_provider.mojom.h"
 
 namespace media {
 
 MojoAndroidOverlay::MojoAndroidOverlay(
     service_manager::mojom::InterfaceProvider* interface_provider,
-    const AndroidOverlay::Config& config,
+    AndroidOverlayConfig config,
     const base::UnguessableToken& routing_token)
-    : interface_provider_(interface_provider), config_(config) {
+    : interface_provider_(interface_provider), config_(std::move(config)) {
   // Connect to the provider service.
   mojom::AndroidOverlayProviderPtr provider_ptr;
   service_manager::GetInterface<mojom::AndroidOverlayProvider>(
       interface_provider_, &provider_ptr_);
 
   // Fill in details of |config| into |mojo_config|.  Our caller could do this
   // too, but since we want to retain |config_| anyway, we do it here.
   mojom::AndroidOverlayConfigPtr mojo_config =
       mojom::AndroidOverlayConfig::New();
   mojo_config->routing_token = routing_token;
@@ skipping 23 matching lines @@
 }
 
 const base::android::JavaRef<jobject>& MojoAndroidOverlay::GetJavaSurface()
     const {
   return surface_.j_surface();
 }
 
 void MojoAndroidOverlay::OnSurfaceReady(uint64_t surface_key) {
   // TODO(liberato): ask binder for the surface here, and fill in |surface_|.
   received_surface_ = true;
-  config_.ready_cb.Run(this);
+  config_.is_ready(this);
 }
 
 void MojoAndroidOverlay::OnDestroyed() {
   // Note that |overlay_ptr_| might not be bound yet, or we might not have ever
   // gotten a surface.  Regardless, the overlay cannot be used.
 
   if (!received_surface_)
-    config_.failed_cb.Run(this);
+    config_.is_failed(this);
   else
-    config_.destroyed_cb.Run(this);
+    config_.is_destroyed(this);
 
   // Note: we do not delete |overlay_ptr_| here.  Our client must delete us to
   // signal that we should do that, since it still might be in use.
 }
 
 }  // namespace media