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

Unified Diff: chrome/browser/media/router/media_router_mojo_impl_unittest.cc

Issue 1259333004: [MediaRouter]Wires up issue manager in MediaRouterMojoImpl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/media/router/media_router_mojo_impl.cc ('k') | chrome/browser/media/router/test_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/media/router/media_router_mojo_impl_unittest.cc
diff --git a/chrome/browser/media/router/media_router_mojo_impl_unittest.cc b/chrome/browser/media/router/media_router_mojo_impl_unittest.cc
index eb51e8381ce3cae9bd6bd39bfe552bdea9c72c9d..86bd51ba0c62e6f195f3fb6668338bd00e86818e 100644
--- a/chrome/browser/media/router/media_router_mojo_impl_unittest.cc
+++ b/chrome/browser/media/router/media_router_mojo_impl_unittest.cc
@@ -9,8 +9,10 @@
#include "base/memory/scoped_ptr.h"
#include "base/run_loop.h"
#include "base/synchronization/waitable_event.h"
+#include "chrome/browser/media/router/issue.h"
#include "chrome/browser/media/router/media_route.h"
#include "chrome/browser/media/router/media_router_mojo_test.h"
+#include "chrome/browser/media/router/media_router_type_converters.h"
#include "chrome/browser/media/router/mock_media_router.h"
#include "chrome/browser/media/router/test_helper.h"
#include "chrome/test/base/chrome_render_view_host_test_harness.h"
@@ -25,6 +27,7 @@
using testing::_;
using testing::Eq;
using testing::Invoke;
+using testing::Mock;
using testing::Pointee;
using testing::Return;
using testing::ReturnRef;
@@ -61,6 +64,21 @@ bool ArePresentationSessionMessagesEqual(
: *(expected->message) == *(actual->message);
}
+interfaces::IssuePtr CreateMojoIssue() {
+ interfaces::IssuePtr mojoIssue;
+ mojoIssue = interfaces::Issue::New();
imcheng 2015/07/29 01:49:38 nit: combine with line above
haibinlu 2015/07/29 17:24:15 Done.
+ mojoIssue->title = "title";
+ mojoIssue->message = "msg";
+ mojoIssue->route_id = "";
+ mojoIssue->default_action = interfaces::Issue::ActionType::ACTION_TYPE_OK;
+ mojoIssue->secondary_actions =
+ mojo::Array<interfaces::Issue::ActionType>::New(0);
+ mojoIssue->severity = interfaces::Issue::Severity::SEVERITY_WARNING;
+ mojoIssue->is_blocking = false;
+ mojoIssue->help_url = "";
+ return mojoIssue.Pass();
+}
+
} // namespace
class RouteResponseCallbackHandler {
@@ -258,6 +276,26 @@ TEST_F(MediaRouterMojoImplTest, CloseRoute) {
ProcessEventLoop();
}
+TEST_F(MediaRouterMojoImplTest, RegisterAndUnregisterIssuesObserver) {
+ MockIssuesObserver issue_observer1(router());
+ MockIssuesObserver issue_observer2(router());
+ const Issue* issue;
+ EXPECT_CALL(issue_observer1, OnIssueUpdated(_))
+ .WillRepeatedly(SaveArg<0>(&issue));
+ EXPECT_CALL(issue_observer2, OnIssueUpdated(_));
+ media_router_proxy_->OnIssue(CreateMojoIssue().Pass());
+ ProcessEventLoop();
+
+ EXPECT_TRUE(Mock::VerifyAndClearExpectations(&issue_observer1));
+ EXPECT_TRUE(Mock::VerifyAndClearExpectations(&issue_observer2));
+
+ router()->ClearIssue(issue->id());
+ router()->UnregisterIssuesObserver(&issue_observer1);
+ EXPECT_CALL(issue_observer2, OnIssueUpdated(_));
+ media_router_proxy_->OnIssue(CreateMojoIssue().Pass());
+ ProcessEventLoop();
+}
+
TEST_F(MediaRouterMojoImplTest, RegisterAndUnregisterMediaSinksObserver) {
MediaSource media_source(kSource);
« no previous file with comments | « chrome/browser/media/router/media_router_mojo_impl.cc ('k') | chrome/browser/media/router/test_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698