Move routing token out of AndroidOverlay config.

media/mojo/clients/mojo_android_overlay_factory.h

Index: media/mojo/clients/mojo_android_overlay_factory.h
diff --git a/media/mojo/clients/mojo_android_overlay_factory.h b/media/mojo/clients/mojo_android_overlay_factory.h
index cea4c44d57f55198b8896acdb6c23792d4cf8168..4320757e9cee2873d181797f11d861721a8279f7 100644
--- a/media/mojo/clients/mojo_android_overlay_factory.h
+++ b/media/mojo/clients/mojo_android_overlay_factory.h
@@ -6,6 +6,7 @@
 #define MEDIA_BASE_MOJO_ANDROID_OVERLAY_FACTORY_H_
 
 #include "base/macros.h"
+#include "base/unguessable_token.h"
 #include "media/base/android/android_overlay_factory.h"
 #include "media/mojo/interfaces/android_overlay.mojom.h"
 
@@ -21,7 +22,8 @@ namespace media {
 class MojoAndroidOverlayFactory : public AndroidOverlayFactory {
  public:
   MojoAndroidOverlayFactory(
-      service_manager::mojom::InterfaceProvider* interface_provider);
+      service_manager::mojom::InterfaceProvider* interface_provider,
+      const base::UnguessableToken& routing_token);

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

Input only parameters before input/output ones.

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

Done.

   ~MojoAndroidOverlayFactory() override;
 
   std::unique_ptr<AndroidOverlay> CreateOverlay(
@@ -29,6 +31,7 @@ class MojoAndroidOverlayFactory : public AndroidOverlayFactory {
 
  private:
   service_manager::mojom::InterfaceProvider* const interface_provider_;
+  base::UnguessableToken routing_token_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoAndroidOverlayFactory);
 };