[Media Router] Clean up OffscreenPresentationManager params.

chrome/browser/media/router/presentation_service_delegate_impl_unittest.cc

 // Copyright 2015 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 "chrome/browser/media/router/presentation_service_delegate_impl.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/test/mock_callback.h"
 #include "chrome/browser/media/router/mock_media_router.h"
 #include "chrome/browser/media/router/mock_screen_availability_listener.h"
@@ skipping 56 matching lines @@
  public:
   MOCK_METHOD1(OnCreateConnectionSuccess,
                void(const content::PresentationInfo& connection));
   MOCK_METHOD1(OnCreateConnectionError,
                void(const content::PresentationError& error));
 };
 
 class MockOffscreenPresentationManager : public OffscreenPresentationManager {
  public:
   void RegisterOffscreenPresentationController(
-      const std::string& presentation_id,
-      const GURL& presentation_url,
+      const content::PresentationInfo& presentation_info,
       const RenderFrameHostId& render_frame_id,
       content::PresentationConnectionPtr controller,
       content::PresentationConnectionRequest,
       const MediaRoute& route) override {
-    RegisterOffscreenPresentationController(presentation_id, presentation_url,
+    RegisterOffscreenPresentationController(presentation_info.presentation_id,
+                                            presentation_info.presentation_url,
                                             render_frame_id, route);
   }
 
   MOCK_METHOD4(RegisterOffscreenPresentationController,
                void(const std::string& presentation_id,

[zhaobin, 2017/06/28 06:46:26]

Change this to content::PresentationInfo as well? Does not really matter
though...

[imcheng, 2017/06/29 06:56:26]

Done. I added a matcher for PresentationInfo in this test.

                     const GURL& presentation_url,
                     const RenderFrameHostId& render_frame_id,
                     const MediaRoute& route));
   MOCK_METHOD2(UnregisterOffscreenPresentationController,
                void(const std::string& presentation_id,
                     const RenderFrameHostId& render_frame_id));
-  MOCK_METHOD3(OnOffscreenPresentationReceiverCreated,
-               void(const std::string& presentation_id,
-                    const GURL& presentation_url,
+  MOCK_METHOD2(OnOffscreenPresentationReceiverCreated,
+               void(const content::PresentationInfo& presentation_info,
                     const content::ReceiverConnectionAvailableCallback&
                         receiver_callback));
   MOCK_METHOD1(OnOffscreenPresentationReceiverTerminated,
                void(const std::string& presentation_id));
   MOCK_METHOD1(IsOffscreenPresentation,
                bool(const std::string& presentation_id));
   MOCK_METHOD1(GetRoute, MediaRoute*(const std::string& presentation_id));
 };
 
 std::unique_ptr<KeyedService> BuildMockOffscreenPresentationManager(
@@ skipping 679 matching lines @@
       base::Bind(&MockCreatePresentationConnnectionCallbacks::
                      OnCreateConnectionSuccess,
                  base::Unretained(&mock_create_connection_callbacks)),
       base::Bind(
           &MockCreatePresentationConnnectionCallbacks::OnCreateConnectionError,
           base::Unretained(&mock_create_connection_callbacks)));
 }
 #endif  // !defined(OS_ANDROID)
 
 }  // namespace media_router