Media Router Mojo: Use new wrapper types.

chrome/browser/media/router/mojo/media_router_mojo_impl.h

 // 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.
 
 #ifndef CHROME_BROWSER_MEDIA_ROUTER_MOJO_MEDIA_ROUTER_MOJO_IMPL_H_
 #define CHROME_BROWSER_MEDIA_ROUTER_MOJO_MEDIA_ROUTER_MOJO_IMPL_H_
 
 #include <stdint.h>
 
 #include <deque>
@@ skipping 269 matching lines @@
 
   // Error handler callback for |binding_| and |media_route_provider_|.
   void OnConnectionError();
 
   // interfaces::MediaRouter implementation.
   void RegisterMediaRouteProvider(
       interfaces::MediaRouteProviderPtr media_route_provider_ptr,
       const interfaces::MediaRouter::RegisterMediaRouteProviderCallback&
           callback) override;
   void OnIssue(interfaces::IssuePtr issue) override;
-  void OnSinksReceived(const mojo::String& media_source,
-                       mojo::Array<interfaces::MediaSinkPtr> sinks,
-                       mojo::Array<mojo::String> origins) override;
-  void OnRoutesUpdated(mojo::Array<interfaces::MediaRoutePtr> routes,
-                       const mojo::String& media_source,
-                       mojo::Array<mojo::String> joinable_route_ids) override;
+  void OnSinksReceived(const std::string& media_source,
+                       std::vector<interfaces::MediaSinkPtr> sinks,
+                       const std::vector<std::string>& origins) override;
+  void OnRoutesUpdated(
+      std::vector<interfaces::MediaRoutePtr> routes,
+      const std::string& media_source,
+      const std::vector<std::string>& joinable_route_ids) override;
   void OnSinkAvailabilityUpdated(
       interfaces::MediaRouter::SinkAvailability availability) override;
   void OnPresentationConnectionStateChanged(
-      const mojo::String& route_id,
+      const std::string& route_id,
       interfaces::MediaRouter::PresentationConnectionState state) override;
   void OnPresentationConnectionClosed(
-      const mojo::String& route_id,
+      const std::string& route_id,
       interfaces::MediaRouter::PresentationConnectionCloseReason reason,
-      const mojo::String& message) override;
+      const std::string& message) override;
   void OnRouteMessagesReceived(
-      const mojo::String& route_id,
-      mojo::Array<interfaces::RouteMessagePtr> messages) override;
+      const std::string& route_id,
+      std::vector<interfaces::RouteMessagePtr> messages) override;
 
   // Result callback when Mojo terminateRoute is invoked.  |route_id| is bound
   // to the ID of the route that was terminated.
   void OnTerminateRouteResult(const MediaRoute::Id& route_id,
-                              mojo::String error_text,
+                              const base::Optional<std::string>& error_text,
                               interfaces::RouteRequestResultCode result_code);
 
   // Converts the callback result of calling Mojo CreateRoute()/JoinRoute()
   // into a local callback.
   void RouteResponseReceived(
       const std::string& presentation_id,
       bool incognito,
       const std::vector<MediaRouteResponseCallback>& callbacks,
       interfaces::MediaRoutePtr media_route,
-      mojo::String error_text,
+      const base::Optional<std::string>& error_text,
       interfaces::RouteRequestResultCode result_code);
 
   // Callback invoked by |event_page_tracker_| after an attempt to wake the
   // component extension. If |success| is false, the pending request queue is
   // drained.
   void EventPageWakeComplete(bool success);
 
   // Removes all requests from the pending requests queue. Called when there is
   // a permanent error connecting to component extension.
   void DrainRequestQueue();
@@ skipping 100 matching lines @@
 #endif
 
   base::WeakPtrFactory<MediaRouterMojoImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaRouterMojoImpl);
 };
 
 }  // namespace media_router
 
 #endif  // CHROME_BROWSER_MEDIA_ROUTER_MOJO_MEDIA_ROUTER_MOJO_IMPL_H_