[MediaRouter] The minimal change to make everything build on Android.

chrome/browser/media/router/media_router.h

Index: chrome/browser/media/router/media_router.h
diff --git a/chrome/browser/media/router/media_router.h b/chrome/browser/media/router/media_router.h
index 1bd815c3e7e59d0b08a4218e221be593c6059f9e..3d9220b04608652ad31349c29ebd0aa21c7b74d7 100644
--- a/chrome/browser/media/router/media_router.h
+++ b/chrome/browser/media/router/media_router.h
@@ -13,6 +13,7 @@
 #include "chrome/browser/media/router/media_route.h"
 #include "chrome/browser/media/router/media_sink.h"
 #include "chrome/browser/media/router/media_source.h"
+#include "components/keyed_service/core/keyed_service.h"
 #include "content/public/browser/presentation_session_message.h"
 
 namespace media_router {
@@ -36,14 +37,14 @@ const int kInvalidTabId = -1;
 // An interface for handling resources related to media routing.
 // Responsible for registering observers for receiving sink availability
 // updates, handling route requests/responses, and operating on routes (e.g.
-// posting messages or closing).
-class MediaRouter {
+// posting messages or closing). Is a KeyedService.

[imcheng, 2015/07/16 18:28:19]

This comment is redundant as the reader can easily infer that from the line
below.

[whywhat, 2015/07/16 20:17:18]

Done.

+class MediaRouter : public KeyedService {
  public:
   using PresentationSessionMessageCallback = base::Callback<void(
       scoped_ptr<ScopedVector<content::PresentationSessionMessage>>)>;
   using SendRouteMessageCallback = base::Callback<void(bool sent)>;
 
-  virtual ~MediaRouter() {}
+  ~MediaRouter() override = default;
 
   // Creates a media route from |source_id| to |sink_id|.
   // |origin| is the URL of requestor's page.