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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1527183003: Change mojo enums to be scoped enums in the generated C++ bindings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mojo-binding-equals
Patch Set: Created 4 years, 12 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/media_router_type_converters.cc » ('j') | components/mus/public/interfaces/input_event_constants.mojom » ('J')
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 f78fa773ce61b97c55d9ca2d9d0ddc15b1fe4718..081eb54fea93f75d9e35c4ed9e31a0a2e2efc871 100644
--- a/chrome/browser/media/router/media_router_mojo_impl_unittest.cc
+++ b/chrome/browser/media/router/media_router_mojo_impl_unittest.cc
@@ -80,11 +80,10 @@ interfaces::IssuePtr CreateMojoIssue(const std::string& title) {
mojoIssue->title = title;
mojoIssue->message = "msg";
mojoIssue->route_id = "";
- mojoIssue->default_action =
- interfaces::Issue::ActionType::ACTION_TYPE_DISMISS;
+ mojoIssue->default_action = interfaces::Issue::ActionType::DISMISS;
mojoIssue->secondary_actions =
mojo::Array<interfaces::Issue::ActionType>::New(0);
- mojoIssue->severity = interfaces::Issue::Severity::SEVERITY_WARNING;
+ mojoIssue->severity = interfaces::Issue::Severity::WARNING;
mojoIssue->is_blocking = false;
mojoIssue->help_url = "";
return mojoIssue;
@@ -358,7 +357,7 @@ TEST_F(MediaRouterMojoImplTest, HandleIssue) {
TEST_F(MediaRouterMojoImplTest, RegisterAndUnregisterMediaSinksObserver) {
router()->OnSinkAvailabilityUpdated(
- interfaces::MediaRouter::SINK_AVAILABILITY_AVAILABLE);
+ interfaces::MediaRouter::SinkAvailability::AVAILABLE);
MediaSource media_source(kSource);
EXPECT_CALL(mock_media_route_provider_,
@@ -388,12 +387,12 @@ TEST_F(MediaRouterMojoImplTest, RegisterAndUnregisterMediaSinksObserver) {
mojo_sinks[0]->sink_id = kSinkId;
mojo_sinks[0]->name = kSinkName;
mojo_sinks[0]->icon_type =
- media_router::interfaces::MediaSink::IconType::ICON_TYPE_CAST;
+ media_router::interfaces::MediaSink::IconType::CAST;
mojo_sinks[1] = interfaces::MediaSink::New();
mojo_sinks[1]->sink_id = kSinkId2;
mojo_sinks[1]->name = kSinkName;
mojo_sinks[1]->icon_type =
- media_router::interfaces::MediaSink::IconType::ICON_TYPE_CAST;
+ media_router::interfaces::MediaSink::IconType::CAST;
EXPECT_CALL(sinks_observer, OnSinksReceived(SequenceEquals(expected_sinks)));
EXPECT_CALL(extra_sinks_observer,
@@ -415,7 +414,7 @@ TEST_F(MediaRouterMojoImplTest, RegisterAndUnregisterMediaSinksObserver) {
TEST_F(MediaRouterMojoImplTest,
RegisterMediaSinksObserverWithAvailabilityChange) {
router()->OnSinkAvailabilityUpdated(
- interfaces::MediaRouter::SINK_AVAILABILITY_UNAVAILABLE);
+ interfaces::MediaRouter::SinkAvailability::UNAVAILABLE);
MediaSource media_source(kSource);
scoped_ptr<MockMediaSinksObserver> sinks_observer(
new MockMediaSinksObserver(router(), media_source));
@@ -435,7 +434,7 @@ TEST_F(MediaRouterMojoImplTest,
ProcessEventLoop();
EXPECT_TRUE(Mock::VerifyAndClearExpectations(&mock_media_route_provider_));
router()->OnSinkAvailabilityUpdated(
- interfaces::MediaRouter::SINK_AVAILABILITY_AVAILABLE);
+ interfaces::MediaRouter::SinkAvailability::AVAILABLE);
EXPECT_CALL(mock_media_route_provider_,
StartObservingMediaSinks(mojo::String(kSource)))
.Times(1);
@@ -445,7 +444,7 @@ TEST_F(MediaRouterMojoImplTest,
ProcessEventLoop();
EXPECT_TRUE(Mock::VerifyAndClearExpectations(&mock_media_route_provider_));
router()->OnSinkAvailabilityUpdated(
- interfaces::MediaRouter::SINK_AVAILABILITY_AVAILABLE);
+ interfaces::MediaRouter::SinkAvailability::AVAILABLE);
EXPECT_CALL(mock_media_route_provider_,
StartObservingMediaSinks(mojo::String(kSource)))
.Times(0);
@@ -456,7 +455,7 @@ TEST_F(MediaRouterMojoImplTest,
EXPECT_TRUE(Mock::VerifyAndClearExpectations(&mock_media_route_provider_));
router()->OnSinkAvailabilityUpdated(
- interfaces::MediaRouter::SINK_AVAILABILITY_UNAVAILABLE);
+ interfaces::MediaRouter::SinkAvailability::UNAVAILABLE);
EXPECT_CALL(mock_media_route_provider_,
StopObservingMediaSinks(mojo::String(kSource)))
.Times(0);
@@ -472,7 +471,7 @@ TEST_F(MediaRouterMojoImplTest,
TEST_F(MediaRouterMojoImplTest,
RegisterAndUnregisterMediaSinksObserverWithAvailabilityChange) {
router()->OnSinkAvailabilityUpdated(
- interfaces::MediaRouter::SINK_AVAILABILITY_UNAVAILABLE);
+ interfaces::MediaRouter::SinkAvailability::UNAVAILABLE);
MediaSource media_source(kSource);
scoped_ptr<MockMediaSinksObserver> sinks_observer(
new MockMediaSinksObserver(router(), media_source));
@@ -491,7 +490,7 @@ TEST_F(MediaRouterMojoImplTest,
.Times(0);
ProcessEventLoop();
router()->OnSinkAvailabilityUpdated(
- interfaces::MediaRouter::SINK_AVAILABILITY_AVAILABLE);
+ interfaces::MediaRouter::SinkAvailability::AVAILABLE);
EXPECT_CALL(mock_media_route_provider_,
StartObservingMediaSinks(mojo::String(kSource)))
.Times(1);
@@ -605,10 +604,10 @@ TEST_F(MediaRouterMojoImplTest, SendRouteBinaryMessage) {
TEST_F(MediaRouterMojoImplTest, PresentationSessionMessagesSingleObserver) {
mojo::Array<interfaces::RouteMessagePtr> mojo_messages(2);
mojo_messages[0] = interfaces::RouteMessage::New();
- mojo_messages[0]->type = interfaces::RouteMessage::Type::TYPE_TEXT;
+ mojo_messages[0]->type = interfaces::RouteMessage::Type::TEXT;
mojo_messages[0]->message = "text";
mojo_messages[1] = interfaces::RouteMessage::New();
- mojo_messages[1]->type = interfaces::RouteMessage::Type::TYPE_BINARY;
+ mojo_messages[1]->type = interfaces::RouteMessage::Type::BINARY;
mojo_messages[1]->data.push_back(1);
ScopedVector<content::PresentationSessionMessage> expected_messages;
@@ -656,7 +655,7 @@ TEST_F(MediaRouterMojoImplTest, PresentationSessionMessagesSingleObserver) {
// call ListenForRouteMessages again when it sees there are no more observers.
mojo::Array<interfaces::RouteMessagePtr> mojo_messages_2(1);
mojo_messages_2[0] = interfaces::RouteMessage::New();
- mojo_messages_2[0]->type = interfaces::RouteMessage::Type::TYPE_TEXT;
+ mojo_messages_2[0]->type = interfaces::RouteMessage::Type::TEXT;
mojo_messages_2[0]->message = "foo";
observer.reset();
mojo_callback_2.Run(std::move(mojo_messages_2), false);
@@ -667,10 +666,10 @@ TEST_F(MediaRouterMojoImplTest, PresentationSessionMessagesSingleObserver) {
TEST_F(MediaRouterMojoImplTest, PresentationSessionMessagesMultipleObservers) {
mojo::Array<interfaces::RouteMessagePtr> mojo_messages(2);
mojo_messages[0] = interfaces::RouteMessage::New();
- mojo_messages[0]->type = interfaces::RouteMessage::Type::TYPE_TEXT;
+ mojo_messages[0]->type = interfaces::RouteMessage::Type::TEXT;
mojo_messages[0]->message = "text";
mojo_messages[1] = interfaces::RouteMessage::New();
- mojo_messages[1]->type = interfaces::RouteMessage::Type::TYPE_BINARY;
+ mojo_messages[1]->type = interfaces::RouteMessage::Type::BINARY;
mojo_messages[1]->data.push_back(1);
ScopedVector<content::PresentationSessionMessage> expected_messages;
@@ -724,7 +723,7 @@ TEST_F(MediaRouterMojoImplTest, PresentationSessionMessagesMultipleObservers) {
// call ListenForRouteMessages again when it sees there are no more observers.
mojo::Array<interfaces::RouteMessagePtr> mojo_messages_2(1);
mojo_messages_2[0] = interfaces::RouteMessage::New();
- mojo_messages_2[0]->type = interfaces::RouteMessage::Type::TYPE_TEXT;
+ mojo_messages_2[0]->type = interfaces::RouteMessage::Type::TEXT;
mojo_messages_2[0]->message = "foo";
observer1.reset();
observer2.reset();
@@ -775,8 +774,7 @@ TEST_F(MediaRouterMojoImplTest, PresentationConnectionStateChangedCallback) {
EXPECT_CALL(callback, Run(content::PRESENTATION_CONNECTION_STATE_CLOSED))
.Times(1);
media_router_proxy_->OnPresentationConnectionStateChanged(
- route_id,
- PresentationConnectionState::PRESENTATION_CONNECTION_STATE_CLOSED);
+ route_id, PresentationConnectionState::CLOSED);
ProcessEventLoop();
EXPECT_TRUE(Mock::VerifyAndClearExpectations(&callback));
@@ -786,8 +784,7 @@ TEST_F(MediaRouterMojoImplTest, PresentationConnectionStateChangedCallback) {
EXPECT_CALL(callback, Run(content::PRESENTATION_CONNECTION_STATE_CLOSED))
.Times(1);
media_router_proxy_->OnPresentationConnectionStateChanged(
- route_id,
- PresentationConnectionState::PRESENTATION_CONNECTION_STATE_CLOSED);
+ route_id, PresentationConnectionState::CLOSED);
ProcessEventLoop();
// Callback has been removed, so we don't expect it to be called anymore.
@@ -797,8 +794,7 @@ TEST_F(MediaRouterMojoImplTest, PresentationConnectionStateChangedCallback) {
EXPECT_CALL(callback, Run(content::PRESENTATION_CONNECTION_STATE_CLOSED))
.Times(0);
media_router_proxy_->OnPresentationConnectionStateChanged(
- route_id,
- PresentationConnectionState::PRESENTATION_CONNECTION_STATE_CLOSED);
+ route_id, PresentationConnectionState::CLOSED);
ProcessEventLoop();
}
« no previous file with comments | « chrome/browser/media/router/media_router_mojo_impl.cc ('k') | chrome/browser/media/router/media_router_type_converters.cc » ('j') | components/mus/public/interfaces/input_event_constants.mojom » ('J')

Powered by Google App Engine
This is Rietveld 408576698