Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(81)

Side by Side Diff: chrome/browser/media/router/media_router_mojo_impl_unittest.cc

Issue 1177073003: [MediaRouter] Update MR-2-Extension's PostMessage to return boolean. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addresses Mark's comments Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <string> 5 #include <string>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/run_loop.h" 10 #include "base/run_loop.h"
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 266
267 EXPECT_CALL(mock_router, UnregisterMediaRoutesObserver(&routes_observer)); 267 EXPECT_CALL(mock_router, UnregisterMediaRoutesObserver(&routes_observer));
268 EXPECT_CALL(mock_router, 268 EXPECT_CALL(mock_router,
269 UnregisterMediaRoutesObserver(&extra_routes_observer)); 269 UnregisterMediaRoutesObserver(&extra_routes_observer));
270 router()->UnregisterMediaRoutesObserver(&routes_observer); 270 router()->UnregisterMediaRoutesObserver(&routes_observer);
271 router()->UnregisterMediaRoutesObserver(&extra_routes_observer); 271 router()->UnregisterMediaRoutesObserver(&extra_routes_observer);
272 EXPECT_CALL(mock_mojo_media_router_service_, StopObservingMediaRoutes()); 272 EXPECT_CALL(mock_mojo_media_router_service_, StopObservingMediaRoutes());
273 ProcessEventLoop(); 273 ProcessEventLoop();
274 } 274 }
275 275
276 TEST_F(MediaRouterMojoImplTest, PostMessage) { 276 void AssertPostMessageResult(bool expected, bool actual) {
277 EXPECT_EQ(expected, actual);
278 }
279
280 TEST_F(MediaRouterMojoImplTest, SendMessage) {
277 EXPECT_CALL(mock_mojo_media_router_service_, 281 EXPECT_CALL(mock_mojo_media_router_service_,
278 PostMessage(mojo::String(kRouteId), mojo::String(kMessage))); 282 SendMessage(mojo::String(kRouteId), mojo::String(kMessage), _))
279 router()->PostMessage(kRouteId, kMessage); 283 .WillOnce(Invoke(
284 [](const MediaRoute::Id& route_id, const std::string& message,
285 const interfaces::MediaRouter::SendMessageCallback & cb) { cb.Run(t rue); }));
Kevin M 2015/06/11 22:45:24 80col
haibinlu 2015/06/11 23:05:22 Done.
286
287 router()->SendMessage(kRouteId, kMessage, base::Bind(&AssertPostMessageResult, true));
Kevin M 2015/06/11 22:45:24 This is potentially buggy because there are no dto
haibinlu 2015/06/11 23:05:23 Good catch. Done.
280 ProcessEventLoop(); 288 ProcessEventLoop();
281 } 289 }
282 290
283 TEST_F(MediaRouterMojoImplTest, QueuedWhileAsleep) { 291 TEST_F(MediaRouterMojoImplTest, QueuedWhileAsleep) {
284 EXPECT_CALL(mock_event_page_tracker_, IsEventPageSuspended(extension_id())) 292 EXPECT_CALL(mock_event_page_tracker_, IsEventPageSuspended(extension_id()))
285 .Times(2) 293 .Times(2)
286 .WillRepeatedly(Return(true)); 294 .WillRepeatedly(Return(true));
287 EXPECT_CALL(mock_event_page_tracker_, WakeEventPage(extension_id(), _)) 295 EXPECT_CALL(mock_event_page_tracker_, WakeEventPage(extension_id(), _))
288 .Times(2) 296 .Times(2)
289 .WillRepeatedly(Return(true)); 297 .WillRepeatedly(Return(true));
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 CloseRoute(mojo::String(kRouteId2))); 379 CloseRoute(mojo::String(kRouteId2)));
372 binding.reset(new mojo::Binding<interfaces::MediaRouter>( 380 binding.reset(new mojo::Binding<interfaces::MediaRouter>(
373 &mock_mojo_media_router_service, mojo::GetProxy(&mojo_media_router))); 381 &mock_mojo_media_router_service, mojo::GetProxy(&mojo_media_router)));
374 mojo_media_router_observer->ProvideMediaRouter( 382 mojo_media_router_observer->ProvideMediaRouter(
375 mojo_media_router.Pass(), base::Bind(&ProvideMediaRouterHandler::Invoke, 383 mojo_media_router.Pass(), base::Bind(&ProvideMediaRouterHandler::Invoke,
376 base::Unretained(&provide_handler))); 384 base::Unretained(&provide_handler)));
377 message_loop.RunUntilIdle(); 385 message_loop.RunUntilIdle();
378 } 386 }
379 387
380 } // namespace media_router 388 } // namespace media_router
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698