Non-Local Join for Media Router and Presentation API

chrome/browser/media/router/presentation_session_state_observer_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 "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/media/router/media_route.h"
 #include "chrome/browser/media/router/media_source_helper.h"
 #include "chrome/browser/media/router/mock_media_router.h"
@@ skipping 72 matching lines @@
   content::PresentationSessionInfo session_info(kPresentationUrl,
                                                 kPresentationId);
   EXPECT_CALL(*this, OnSessionStateChanged(
                          PresentationSessionInfoEquals(session_info),
                          content::PRESENTATION_SESSION_STATE_CONNECTED));
   MediaRoute::Id route_id(CreateRouteId(kPresentationUrl, kPresentationId));
   observer_->OnPresentationSessionConnected(route_id);
 
   // Route list update is expected to follow creation of route.
   std::vector<MediaRoute> routes;
+  MediaSource media_source = MediaSourceForPresentationUrl(kPresentationUrl);
   routes.push_back(MediaRoute(route_id,
-                              MediaSourceForPresentationUrl(kPresentationUrl),
+                              media_source,
                               "sinkId", "Description", true, "", false));
-  observer_->OnRoutesUpdated(routes);
+  observer_->OnRoutesUpdated(media_source.id(),
+                             routes,
+                             std::vector<MediaRoute>());
 
   // New route list does not contain |route_id|, which means it is disconnected.
   EXPECT_CALL(*this, OnSessionStateChanged(
                          PresentationSessionInfoEquals(session_info),
                          content::PRESENTATION_SESSION_STATE_DISCONNECTED));
-  observer_->OnRoutesUpdated(std::vector<MediaRoute>());
+  observer_->OnRoutesUpdated(media_source.id(),
+      std::vector<MediaRoute>(), std::vector<MediaRoute>());
 
   // Note that it is normally not possible for |route_id| to reappear. But in
   // case it does, test that it does NOT invoke the callback with CONNECTED.
   EXPECT_TRUE(testing::Mock::VerifyAndClearExpectations(this));
-  observer_->OnRoutesUpdated(routes);
+  observer_->OnRoutesUpdated(media_source.id(),
+                             routes,
+                             std::vector<MediaRoute>());
 }
 
 TEST_F(PresentationSessionStateObserverTest, Reset) {
   content::PresentationSessionInfo session_info(kPresentationUrl,
                                                 kPresentationId);
   EXPECT_CALL(*this, OnSessionStateChanged(
                          PresentationSessionInfoEquals(session_info),
                          content::PRESENTATION_SESSION_STATE_CONNECTED));
   MediaRoute::Id route_id(CreateRouteId(kPresentationUrl, kPresentationId));
   observer_->OnPresentationSessionConnected(route_id);
-
+  MediaSource media_source = MediaSourceForPresentationUrl(kPresentationUrl);
   // Route list update is expected to follow creation of route.
   std::vector<MediaRoute> routes;
   routes.push_back(MediaRoute(route_id,
-                              MediaSourceForPresentationUrl(kPresentationUrl),
+                              media_source,
                               "sinkId", "Description", true, "", false));
-  observer_->OnRoutesUpdated(routes);
+  observer_->OnRoutesUpdated(media_source.id(),
+                             routes,
+                             std::vector<MediaRoute>());
 
   // |route_id| is no longer being tracked.
   observer_->Reset();
   EXPECT_TRUE(testing::Mock::VerifyAndClearExpectations(this));
-  observer_->OnRoutesUpdated(std::vector<MediaRoute>());
+  observer_->OnRoutesUpdated(media_source.id(),
+                             std::vector<MediaRoute>(),
+                             std::vector<MediaRoute>());
 }
 
 }  // namespace media_router