Move routing token out of AndroidOverlay config.

media/mojo/clients/mojo_android_overlay_unittest.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 <memory>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 78 matching lines @@
 
 class MojoAndroidOverlayTest : public ::testing::Test {
  public:
   MojoAndroidOverlayTest()
       : overlay_binding_(&mock_overlay_), interface_provider_(mock_provider_) {}
 
   ~MojoAndroidOverlayTest() override {}
 
   void SetUp() override {
     // Set up default config.
-    config_.routing_token = base::UnguessableToken::Create();
     config_.rect = gfx::Rect(100, 200, 300, 400);
     config_.ready_cb = base::Bind(&MockClientCallbacks::OnReady,
                                   base::Unretained(&callbacks_));
     config_.failed_cb = base::Bind(&MockClientCallbacks::OnFailed,
                                    base::Unretained(&callbacks_));
     config_.destroyed_cb = base::Bind(&MockClientCallbacks::OnDestroyed,
                                       base::Unretained(&callbacks_));
   }
 
   void TearDown() override {
     overlay_client_.reset();
     base::RunLoop().RunUntilIdle();
   }
 
   // Create an overlay in |overlay_client_| using the current config, but do
   // not bind anything to |overlay_request_| yet.
   void CreateOverlay() {
     EXPECT_CALL(interface_provider_,
                 InterfaceGotten(mojom::AndroidOverlayProvider::Name_))
         .Times(1);
     EXPECT_CALL(mock_provider_, OverlayCreated());
 
+    base::UnguessableToken routing_token = base::UnguessableToken::Create();
     overlay_client_.reset(
-        new MojoAndroidOverlay(&interface_provider_, config_));
+        new MojoAndroidOverlay(&interface_provider_, config_, routing_token));
     base::RunLoop().RunUntilIdle();
   }
 
   // Create an overlay, then provide it with |mock_overlay_|.
   void CreateAndInitializeOverlay() {
     CreateOverlay();
 
     // Bind an overlay to the request.
     overlay_binding_.Bind(std::move(mock_provider_.overlay_request_));
     base::RunLoop().RunUntilIdle();
@@ skipping 72 matching lines @@
 // Test that layouts are ignored before the client is notified about a surface.
 TEST_F(MojoAndroidOverlayTest, LayoutBeforeSurfaceIsIgnored) {
   CreateAndInitializeOverlay();
 
   gfx::Rect new_layout(5, 6, 7, 8);
   EXPECT_CALL(mock_overlay_, ScheduleLayout(_)).Times(0);
   overlay_client_->ScheduleLayout(new_layout);
 }
 
 }  // namespace media