Move routing token out of AndroidOverlay config.

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)
+    const AndroidOverlay::Config& config,
+    const base::UnguessableToken& routing_token)
     : interface_provider_(interface_provider), config_(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 = config_.routing_token;
+  mojo_config->routing_token = routing_token;
   mojo_config->rect = config_.rect;
 
   mojom::AndroidOverlayClientPtr ptr;
   binding_ = base::MakeUnique<mojo::Binding<mojom::AndroidOverlayClient>>(
       this, mojo::MakeRequest(&ptr));
 
   provider_ptr_->CreateOverlay(mojo::MakeRequest(&overlay_ptr_), std::move(ptr),
                                std::move(mojo_config));
 }
 
@@ skipping 29 matching lines @@
   if (!received_surface_)
     config_.failed_cb.Run();
   else
     config_.destroyed_cb.Run();
 
   // 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