Index: chrome/browser/media/router/offscreen_presentation_manager_unittest.cc |
diff --git a/chrome/browser/media/router/offscreen_presentation_manager_unittest.cc b/chrome/browser/media/router/offscreen_presentation_manager_unittest.cc |
index 03bfa041276ea2e98e944c90d26afcfc88d38bc2..92256f0cc0d790ad43bda423b54bb162dbdea7af 100644 |
--- a/chrome/browser/media/router/offscreen_presentation_manager_unittest.cc |
+++ b/chrome/browser/media/router/offscreen_presentation_manager_unittest.cc |
@@ -17,6 +17,8 @@ namespace media_router { |
namespace { |
const char kPresentationId[] = "presentationId"; |
const char kPresentationId2[] = "presentationId2"; |
+const char kPresentationUrl[] = "presentationUrl"; |
+const char kPresentationUrl2[] = "presentationUrl2"; |
} // namespace |
class MockOffscreenPresentationClient |
@@ -26,6 +28,10 @@ class MockOffscreenPresentationClient |
void(OffscreenPresentationClient*)); |
MOCK_METHOD1(RemoveOffscreenPresentationClient, |
void(OffscreenPresentationClient*)); |
+ MOCK_METHOD3(OnSessionMessages, |
+ void(const content::PresentationSessionInfo&, |
+ const ScopedVector<content::PresentationSessionMessage>&, |
+ bool)); |
}; |
class OffscreenPresentationManagerTest : public ::testing::Test { |
@@ -61,8 +67,9 @@ void OffscreenPresentationManagerTest::verifyControllerSize( |
TEST_F(OffscreenPresentationManagerTest, |
RegisterControllerCreateNewPresentation) { |
MockOffscreenPresentationClient controller; |
- manager()->RegisterOffscreenPresentationController(kPresentationId, 1, |
- &controller); |
+ manager()->RegisterOffscreenPresentationController( |
+ kPresentationId, kPresentationUrl, 1, &controller); |
+ |
verifyPresentationsSize(1); |
} |
@@ -89,22 +96,22 @@ TEST_F(OffscreenPresentationManagerTest, UnregisterReceiverNoCrash) { |
TEST_F(OffscreenPresentationManagerTest, |
RegisterControllerCreatePresentationWithTwoControllers) { |
MockOffscreenPresentationClient controller1; |
- manager()->RegisterOffscreenPresentationController(kPresentationId, 1, |
- &controller1); |
+ manager()->RegisterOffscreenPresentationController( |
+ kPresentationId, kPresentationUrl, 1, &controller1); |
MockOffscreenPresentationClient controller2; |
- manager()->RegisterOffscreenPresentationController(kPresentationId, 2, |
- &controller2); |
+ manager()->RegisterOffscreenPresentationController( |
+ kPresentationId, kPresentationUrl, 2, &controller2); |
verifyPresentationsSize(1); |
} |
TEST_F(OffscreenPresentationManagerTest, |
RegisterControllerCreateTwoPresentations) { |
MockOffscreenPresentationClient controller1; |
- manager()->RegisterOffscreenPresentationController(kPresentationId, 1, |
- &controller1); |
+ manager()->RegisterOffscreenPresentationController( |
+ kPresentationId, kPresentationUrl, 1, &controller1); |
MockOffscreenPresentationClient controller2; |
- manager()->RegisterOffscreenPresentationController(kPresentationId2, 1, |
- &controller2); |
+ manager()->RegisterOffscreenPresentationController( |
+ kPresentationId2, kPresentationUrl2, 1, &controller2); |
verifyPresentationsSize(2); |
} |
@@ -116,8 +123,8 @@ TEST_F(OffscreenPresentationManagerTest, |
verifyPresentationsSize(0); |
EXPECT_CALL(receiver_callback, OnReceiverConnectionAvailable(_, &controller)); |
- manager()->RegisterOffscreenPresentationController(kPresentationId, 1, |
- &controller); |
+ manager()->RegisterOffscreenPresentationController( |
+ kPresentationId, kPresentationUrl, 1, &controller); |
manager()->RegisterOffscreenPresentationReceiver( |
kPresentationId, base::Bind(&MockReceiverConnectionAvailableCallback:: |
OnReceiverConnectionAvailable, |
@@ -126,8 +133,8 @@ TEST_F(OffscreenPresentationManagerTest, |
TEST_F(OffscreenPresentationManagerTest, RegisterUnregisterController) { |
MockOffscreenPresentationClient controller; |
- manager()->RegisterOffscreenPresentationController(kPresentationId, 1, |
- &controller); |
+ manager()->RegisterOffscreenPresentationController( |
+ kPresentationId, kPresentationUrl, 1, &controller); |
manager()->UnregisterOffscreenPresentationController(kPresentationId, 1); |
verifyPresentationsSize(0); |
} |
@@ -137,8 +144,8 @@ TEST_F(OffscreenPresentationManagerTest, UnregisterReceiverOnly) { |
MockReceiverConnectionAvailableCallback receiver_callback; |
EXPECT_CALL(receiver_callback, OnReceiverConnectionAvailable(_, &controller)); |
- manager()->RegisterOffscreenPresentationController(kPresentationId, 1, |
- &controller); |
+ manager()->RegisterOffscreenPresentationController( |
+ kPresentationId, kPresentationUrl, 1, &controller); |
manager()->RegisterOffscreenPresentationReceiver( |
kPresentationId, base::Bind(&MockReceiverConnectionAvailableCallback:: |
OnReceiverConnectionAvailable, |
@@ -153,8 +160,8 @@ TEST_F(OffscreenPresentationManagerTest, UnregisterControllerOnly) { |
MockReceiverConnectionAvailableCallback receiver_callback; |
EXPECT_CALL(receiver_callback, OnReceiverConnectionAvailable(_, &controller)); |
- manager()->RegisterOffscreenPresentationController(kPresentationId, 1, |
- &controller); |
+ manager()->RegisterOffscreenPresentationController( |
+ kPresentationId, kPresentationUrl, 1, &controller); |
manager()->RegisterOffscreenPresentationReceiver( |
kPresentationId, base::Bind(&MockReceiverConnectionAvailableCallback:: |
OnReceiverConnectionAvailable, |
@@ -169,8 +176,8 @@ TEST_F(OffscreenPresentationManagerTest, UnregisterReceiverController) { |
MockReceiverConnectionAvailableCallback receiver_callback; |
EXPECT_CALL(receiver_callback, OnReceiverConnectionAvailable(_, &controller)); |
- manager()->RegisterOffscreenPresentationController(kPresentationId, 1, |
- &controller); |
+ manager()->RegisterOffscreenPresentationController( |
+ kPresentationId, kPresentationUrl, 1, &controller); |
manager()->RegisterOffscreenPresentationReceiver( |
kPresentationId, base::Bind(&MockReceiverConnectionAvailableCallback:: |
OnReceiverConnectionAvailable, |
@@ -187,8 +194,8 @@ TEST_F(OffscreenPresentationManagerTest, UnregisterControllerReceiver) { |
MockReceiverConnectionAvailableCallback receiver_callback; |
EXPECT_CALL(receiver_callback, OnReceiverConnectionAvailable(_, &controller)); |
- manager()->RegisterOffscreenPresentationController(kPresentationId, 1, |
- &controller); |
+ manager()->RegisterOffscreenPresentationController( |
+ kPresentationId, kPresentationUrl, 1, &controller); |
manager()->RegisterOffscreenPresentationReceiver( |
kPresentationId, base::Bind(&MockReceiverConnectionAvailableCallback:: |
OnReceiverConnectionAvailable, |
@@ -203,11 +210,11 @@ TEST_F(OffscreenPresentationManagerTest, UnregisterControllerReceiver) { |
TEST_F(OffscreenPresentationManagerTest, |
RegisterTwoControllersThenReceiverFireOnConnectionAvailableTwice) { |
MockOffscreenPresentationClient controller; |
- manager()->RegisterOffscreenPresentationController(kPresentationId, 1, |
- &controller); |
+ manager()->RegisterOffscreenPresentationController( |
+ kPresentationId, kPresentationUrl, 1, &controller); |
MockOffscreenPresentationClient controller2; |
- manager()->RegisterOffscreenPresentationController(kPresentationId, 2, |
- &controller2); |
+ manager()->RegisterOffscreenPresentationController( |
+ kPresentationId, kPresentationUrl, 2, &controller2); |
MockReceiverConnectionAvailableCallback receiver_callback; |
EXPECT_CALL(receiver_callback, OnReceiverConnectionAvailable(_, &controller)); |
@@ -223,8 +230,8 @@ TEST_F(OffscreenPresentationManagerTest, |
TEST_F(OffscreenPresentationManagerTest, |
RegisterControllerReceiverConontrollerFireOnConnectionAvailableTwice) { |
MockOffscreenPresentationClient controller; |
- manager()->RegisterOffscreenPresentationController(kPresentationId, 1, |
- &controller); |
+ manager()->RegisterOffscreenPresentationController( |
+ kPresentationId, kPresentationUrl, 1, &controller); |
MockReceiverConnectionAvailableCallback receiver_callback; |
EXPECT_CALL(receiver_callback, OnReceiverConnectionAvailable(_, &controller)); |
manager()->RegisterOffscreenPresentationReceiver( |
@@ -235,18 +242,18 @@ TEST_F(OffscreenPresentationManagerTest, |
MockOffscreenPresentationClient controller2; |
EXPECT_CALL(receiver_callback, |
OnReceiverConnectionAvailable(_, &controller2)); |
- manager()->RegisterOffscreenPresentationController(kPresentationId, 2, |
- &controller2); |
+ manager()->RegisterOffscreenPresentationController( |
+ kPresentationId, kPresentationUrl, 2, &controller2); |
} |
TEST_F(OffscreenPresentationManagerTest, |
OnePresentationUnregisterFirstController) { |
MockOffscreenPresentationClient controller; |
- manager()->RegisterOffscreenPresentationController(kPresentationId, 1, |
- &controller); |
+ manager()->RegisterOffscreenPresentationController( |
+ kPresentationId, kPresentationUrl, 1, &controller); |
MockOffscreenPresentationClient controller2; |
- manager()->RegisterOffscreenPresentationController(kPresentationId, 2, |
- &controller2); |
+ manager()->RegisterOffscreenPresentationController( |
+ kPresentationId, kPresentationUrl, 2, &controller2); |
MockReceiverConnectionAvailableCallback receiver_callback; |
EXPECT_CALL(receiver_callback, OnReceiverConnectionAvailable(_, _)).Times(2); |
@@ -262,8 +269,8 @@ TEST_F(OffscreenPresentationManagerTest, |
TEST_F(OffscreenPresentationManagerTest, TwoPresentations) { |
MockOffscreenPresentationClient controller; |
- manager()->RegisterOffscreenPresentationController(kPresentationId, 1, |
- &controller); |
+ manager()->RegisterOffscreenPresentationController( |
+ kPresentationId, kPresentationUrl, 1, &controller); |
MockReceiverConnectionAvailableCallback receiver_callback; |
EXPECT_CALL(receiver_callback, OnReceiverConnectionAvailable(_, &controller)); |
manager()->RegisterOffscreenPresentationReceiver( |
@@ -271,8 +278,8 @@ TEST_F(OffscreenPresentationManagerTest, TwoPresentations) { |
OnReceiverConnectionAvailable, |
base::Unretained(&receiver_callback))); |
MockOffscreenPresentationClient controller2; |
- manager()->RegisterOffscreenPresentationController(kPresentationId2, 2, |
- &controller2); |
+ manager()->RegisterOffscreenPresentationController( |
+ kPresentationId2, kPresentationUrl, 2, &controller2); |
MockReceiverConnectionAvailableCallback receiver_callback2; |
EXPECT_CALL(receiver_callback2, |
OnReceiverConnectionAvailable(_, &controller2)); |