Change mojo enums to be scoped enums in the generated C++ bindings.

chrome/browser/media/router/media_router_mojo_impl_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 <stddef.h>
 #include <stdint.h>
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 62 matching lines @@
 
   return expected->is_binary() ? *expected->data == *actual->data
                                : expected->message == actual->message;
 }
 
 interfaces::IssuePtr CreateMojoIssue(const std::string& title) {
   interfaces::IssuePtr mojoIssue = interfaces::Issue::New();
   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;
 }
 
 }  // namespace
 
 class RouteResponseCallbackHandler {
  public:
   MOCK_METHOD3(Invoke,
@@ skipping 253 matching lines @@
               OnIssueUpdated(Pointee(EqualsIssue(expected_issue2))));
   media_router_proxy_->OnIssue(std::move(mojo_issue2));
   ProcessEventLoop();
 
   issue_observer1.UnregisterObserver();
   issue_observer2.UnregisterObserver();
 }
 
 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_,
               StartObservingMediaSinks(mojo::String(kSource)))
       .Times(2);
   EXPECT_CALL(mock_media_route_provider_,
               StartObservingMediaSinks(mojo::String(kSource2)));
 
   MockMediaSinksObserver sinks_observer(router(), media_source);
   EXPECT_TRUE(sinks_observer.Init());
   MockMediaSinksObserver extra_sinks_observer(router(), media_source);
   EXPECT_TRUE(extra_sinks_observer.Init());
   MockMediaSinksObserver unrelated_sinks_observer(router(),
                                                   MediaSource(kSource2));
   EXPECT_TRUE(unrelated_sinks_observer.Init());
 
   ProcessEventLoop();
 
   std::vector<MediaSink> expected_sinks;
   expected_sinks.push_back(
       MediaSink(kSinkId, kSinkName, MediaSink::IconType::CAST));
   expected_sinks.push_back(
       MediaSink(kSinkId2, kSinkName, MediaSink::IconType::CAST));
 
   mojo::Array<interfaces::MediaSinkPtr> mojo_sinks(2);
   mojo_sinks[0] = interfaces::MediaSink::New();
   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,
               OnSinksReceived(SequenceEquals(expected_sinks)));
   media_router_proxy_->OnSinksReceived(media_source.id(),
                                        std::move(mojo_sinks));
   ProcessEventLoop();
 
   EXPECT_CALL(mock_media_route_provider_,
               StopObservingMediaSinks(mojo::String(kSource)));
   EXPECT_CALL(mock_media_route_provider_,
               StopObservingMediaSinks(mojo::String(kSource2)));
   router()->UnregisterMediaSinksObserver(&sinks_observer);
   router()->UnregisterMediaSinksObserver(&extra_sinks_observer);
   router()->UnregisterMediaSinksObserver(&unrelated_sinks_observer);
   ProcessEventLoop();
 }
 
 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));
   EXPECT_CALL(*sinks_observer, OnSinksReceived(IsEmpty()));
   EXPECT_TRUE(sinks_observer->Init());
   MediaSource media_source2(kSource2);
   scoped_ptr<MockMediaSinksObserver> sinks_observer2(
       new MockMediaSinksObserver(router(), media_source2));
   EXPECT_CALL(*sinks_observer2, OnSinksReceived(IsEmpty()));
   EXPECT_TRUE(sinks_observer2->Init());
   EXPECT_CALL(mock_media_route_provider_,
               StartObservingMediaSinks(mojo::String(kSource)))
       .Times(0);
   EXPECT_CALL(mock_media_route_provider_,
               StartObservingMediaSinks(mojo::String(kSource2)))
       .Times(0);
   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);
   EXPECT_CALL(mock_media_route_provider_,
               StartObservingMediaSinks(mojo::String(kSource2)))
       .Times(1);
   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);
   EXPECT_CALL(mock_media_route_provider_,
               StartObservingMediaSinks(mojo::String(kSource2)))
       .Times(0);
   ProcessEventLoop();
   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);
   EXPECT_CALL(mock_media_route_provider_,
               StopObservingMediaSinks(mojo::String(kSource2)))
       .Times(0);
   sinks_observer.reset();
   sinks_observer2.reset();
   ProcessEventLoop();
   EXPECT_TRUE(Mock::VerifyAndClearExpectations(&mock_media_route_provider_));
 }
 
 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));
   EXPECT_CALL(*sinks_observer, OnSinksReceived(IsEmpty()));
   EXPECT_TRUE(sinks_observer->Init());
   MediaSource media_source2(kSource2);
   scoped_ptr<MockMediaSinksObserver> sinks_observer2(
       new MockMediaSinksObserver(router(), media_source2));
   EXPECT_CALL(*sinks_observer2, OnSinksReceived(IsEmpty()));
   EXPECT_TRUE(sinks_observer2->Init());
   EXPECT_CALL(mock_media_route_provider_,
               StartObservingMediaSinks(mojo::String(kSource)))
       .Times(0);
   EXPECT_CALL(mock_media_route_provider_,
               StartObservingMediaSinks(mojo::String(kSource2)))
       .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);
   EXPECT_CALL(mock_media_route_provider_,
               StartObservingMediaSinks(mojo::String(kSource2)))
       .Times(1);
   EXPECT_CALL(mock_media_route_provider_,
               StopObservingMediaSinks(mojo::String(kSource)))
       .Times(1);
   EXPECT_CALL(mock_media_route_provider_,
@@ skipping 93 matching lines @@
   router()->SendRouteBinaryMessage(
       kRouteId, std::move(expected_binary_data),
       base::Bind(&SendMessageCallbackHandler::Invoke,
                  base::Unretained(&handler)));
   ProcessEventLoop();
 }
 
 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;
   scoped_ptr<content::PresentationSessionMessage> message;
   message.reset(new content::PresentationSessionMessage(
       content::PresentationMessageType::TEXT));
   message->message = "text";
   expected_messages.push_back(std::move(message));
 
   message.reset(new content::PresentationSessionMessage(
@@ skipping 27 matching lines @@
   interfaces::MediaRouteProvider::ListenForRouteMessagesCallback
       mojo_callback_2;
   EXPECT_CALL(mock_media_route_provider_, ListenForRouteMessages(_, _))
       .WillOnce(SaveArg<1>(&mojo_callback_2));
   ProcessEventLoop();
 
   // Stop listening for messages. In particular, MediaRouterMojoImpl will not
   // 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);
   EXPECT_CALL(mock_media_route_provider_, StopListeningForRouteMessages(_));
   ProcessEventLoop();
 }
 
 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;
   scoped_ptr<content::PresentationSessionMessage> message;
   message.reset(new content::PresentationSessionMessage(
       content::PresentationMessageType::TEXT));
   message->message = "text";
   expected_messages.push_back(std::move(message));
 
   message.reset(new content::PresentationSessionMessage(
@@ skipping 33 matching lines @@
   interfaces::MediaRouteProvider::ListenForRouteMessagesCallback
       mojo_callback_2;
   EXPECT_CALL(mock_media_route_provider_, ListenForRouteMessages(_, _))
       .WillOnce(SaveArg<1>(&mojo_callback_2));
   ProcessEventLoop();
 
   // Stop listening for messages. In particular, MediaRouterMojoImpl will not
   // 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();
   mojo_callback_2.Run(std::move(mojo_messages_2), false);
   EXPECT_CALL(mock_media_route_provider_, StopListeningForRouteMessages(_));
   ProcessEventLoop();
 }
 
 TEST_F(MediaRouterMojoImplTest, PresentationSessionMessagesError) {
   MediaRoute::Id expected_route_id("foo");
@@ skipping 30 matching lines @@
   MockPresentationConnectionStateChangedCallback callback;
   scoped_ptr<PresentationConnectionStateSubscription> subscription =
       router()->AddPresentationConnectionStateChangedCallback(
           route_id,
           base::Bind(&MockPresentationConnectionStateChangedCallback::Run,
                      base::Unretained(&callback)));
 
   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));
 
   // Right now we don't keep track of previous state so the callback will be
   // invoked with the same state again.
   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.
   subscription.reset();
   EXPECT_TRUE(router()->presentation_connection_state_callbacks_.empty());
 
   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();
 }
 
 TEST_F(MediaRouterMojoImplTest, HasLocalRoute) {
   EXPECT_FALSE(router()->HasLocalDisplayRoute());
   interfaces::MediaRoutePtr mojo_route1 = interfaces::MediaRoute::New();
   mojo_route1->media_route_id = "routeId1";
   mojo_route1->media_sink_id = "sinkId";
   mojo_route1->is_local = false;
   mojo_route1->for_display = false;
@@ skipping 260 matching lines @@
   EXPECT_CALL(provide_handler_, Invoke(testing::Not("")));
   EXPECT_CALL(*process_manager_, IsEventPageSuspended(kExtensionId))
       .WillOnce(Return(false));
   EXPECT_CALL(mock_media_route_provider_, DetachRoute(mojo::String(kRouteId2)))
       .Times(kMaxPendingRequests);
   RegisterMediaRouteProvider();
   ProcessEventLoop();
 }
 
 }  // namespace media_router