Move routing token out of AndroidOverlay config.

media/mojo/clients/mojo_android_overlay.h

Index: media/mojo/clients/mojo_android_overlay.h
diff --git a/media/mojo/clients/mojo_android_overlay.h b/media/mojo/clients/mojo_android_overlay.h
index b96d0f5341446e2288ba0355551a332509fcc0a7..c3705776f9ce4f6aa8e0caf90d625aacd33dc170 100644
--- a/media/mojo/clients/mojo_android_overlay.h
+++ b/media/mojo/clients/mojo_android_overlay.h
@@ -6,6 +6,7 @@
 #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"
@@ -24,7 +25,8 @@ class MojoAndroidOverlay : public AndroidOverlay,
  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;