Move routing token out of AndroidOverlay config.

media/mojo/clients/mojo_android_overlay.h

 // 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.
 
 #ifndef MEDIA_BASE_MOJO_ANDROID_OVERLAY_H_
 #define MEDIA_BASE_MOJO_ANDROID_OVERLAY_H_
 
 #include "base/macros.h"
+#include "base/unguessable_token.h"
 #include "media/base/android/android_overlay.h"
 #include "media/mojo/interfaces/android_overlay.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
 
 namespace service_manager {
 namespace mojom {
 class InterfaceProvider;
 }
 }
 
 namespace media {
 
 // AndroidOverlay implementation via mojo.
 class MojoAndroidOverlay : public AndroidOverlay,
                            public mojom::AndroidOverlayClient {
  public:
   MojoAndroidOverlay(
       service_manager::mojom::InterfaceProvider* interface_provider,
-      const AndroidOverlay::Config& config);
+      const AndroidOverlay::Config& config,
+      const base::UnguessableToken& routing_token);

[DaleCurtis, 2017/04/04 18:48:21]

Should probably add a move constructor for this, but current syntax is fine.

[liberato (no reviews please), 2017/04/04 20:00:21]

UG has no movable data, so i omitted it.

or did you mean MojoAndroidOverlay?

[DaleCurtis, 2017/04/04 20:14:55]

Meant UG should get a move constructor (in another CL).

 
   ~MojoAndroidOverlay() override;
 
   // AndroidOverlay
   void ScheduleLayout(const gfx::Rect& rect) override;
   const base::android::JavaRef<jobject>& GetJavaSurface() const override;
 
   // mojom::AndroidOverlayClient
   void OnSurfaceReady(uint64_t surface_key) override;
   void OnDestroyed() override;
 
  private:
   service_manager::mojom::InterfaceProvider* interface_provider_;
   AndroidOverlay::Config config_;
   mojom::AndroidOverlayProviderPtr provider_ptr_;
   mojom::AndroidOverlayPtr overlay_ptr_;
   std::unique_ptr<mojo::Binding<mojom::AndroidOverlayClient>> binding_;
   gl::ScopedJavaSurface surface_;
 
   // Have we received OnSurfaceReady yet?
   bool received_surface_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(MojoAndroidOverlay);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_MOJO_ANDROID_OVERLAY_H_