diff --git a/chrome/browser/media/router/issue.cc b/chrome/browser/media/router/issue.cc
index de7b907baea476..6798d950fe55dd 100644
--- a/chrome/browser/media/router/issue.cc
+++ b/chrome/browser/media/router/issue.cc
@@ -17,7 +17,7 @@ Issue::Issue(const std::string& title,
              const std::string& message,
              const IssueAction& default_action,
              const std::vector<IssueAction>& secondary_actions,
-             const MediaRouteId& route_id,
+             const MediaRoute::Id& route_id,
              const Issue::Severity severity,
              bool is_blocking,
              const std::string& help_url)
diff --git a/chrome/browser/media/router/issue.h b/chrome/browser/media/router/issue.h
index 8897ef9b5352da..da8c13964d367b 100644
--- a/chrome/browser/media/router/issue.h
+++ b/chrome/browser/media/router/issue.h
@@ -32,7 +32,7 @@ class IssueAction {
 // Contains the information relevant to an issue.
 class Issue {
  public:
-  using IssueId = std::string;
+  using Id = std::string;
 
   enum Severity { FATAL, WARNING, NOTIFICATION };
 
@@ -51,7 +51,7 @@ class Issue {
         const std::string& message,
         const IssueAction& default_action,
         const std::vector<IssueAction>& secondary_actions,
-        const MediaRouteId& route_id,
+        const MediaRoute::Id& route_id,
         const Severity severity,
         bool is_blocking,
         const std::string& helpUrl);
@@ -65,9 +65,9 @@ class Issue {
   const std::vector<IssueAction>& secondary_actions() const {
     return secondary_actions_;
   }
-  MediaRouteId route_id() const { return route_id_; }
+  MediaRoute::Id route_id() const { return route_id_; }
   Severity severity() const { return severity_; }
-  const IssueId& id() const { return id_; }
+  const Issue::Id& id() const { return id_; }
   bool is_blocking() const { return is_blocking_; }
   bool is_global() const { return route_id_.empty(); }
   const GURL& help_url() const { return help_url_; }
@@ -81,7 +81,7 @@ class Issue {
   std::vector<IssueAction> secondary_actions_;
   std::string route_id_;
   Severity severity_;
-  IssueId id_;
+  Issue::Id id_;
   bool is_blocking_;
   GURL help_url_;
 };
diff --git a/chrome/browser/media/router/issue_manager.cc b/chrome/browser/media/router/issue_manager.cc
index cedd0cb5c1fd92..e8075fa29ffdba 100644
--- a/chrome/browser/media/router/issue_manager.cc
+++ b/chrome/browser/media/router/issue_manager.cc
@@ -25,7 +25,7 @@ void IssueManager::AddIssue(const Issue& issue) {
   MaybeUpdateTopIssue();
 }
 
-void IssueManager::ClearIssue(const Issue::IssueId& issue_id) {
+void IssueManager::ClearIssue(const Issue::Id& issue_id) {
   DCHECK(thread_checker_.CalledOnValidThread());
   issues_.erase(std::remove_if(issues_.begin(), issues_.end(),
                                [&issue_id](const Issue& issue) {
@@ -55,7 +55,7 @@ void IssueManager::ClearGlobalIssues() {
   MaybeUpdateTopIssue();
 }
 
-void IssueManager::ClearIssuesWithRouteId(const MediaRouteId& route_id) {
+void IssueManager::ClearIssuesWithRouteId(const MediaRoute::Id& route_id) {
   DCHECK(thread_checker_.CalledOnValidThread());
   issues_.erase(std::remove_if(issues_.begin(), issues_.end(),
                                [&route_id](const Issue& issue) {
diff --git a/chrome/browser/media/router/issue_manager.h b/chrome/browser/media/router/issue_manager.h
index badce236aba5c2..a180dcf786cfaa 100644
--- a/chrome/browser/media/router/issue_manager.h
+++ b/chrome/browser/media/router/issue_manager.h
@@ -28,8 +28,8 @@ class IssueManager {
   void AddIssue(const Issue& issue);
 
   // Removes an issue when user has noted it is resolved.
-  // |issue_id|: Issue::IssueId of the issue to be removed.
-  void ClearIssue(const Issue::IssueId& issue_id);
+  // |issue_id|: Issue::Id of the issue to be removed.
+  void ClearIssue(const Issue::Id& issue_id);
 
   // Gets the number of unresolved issues.
   size_t GetIssueCount() const;
@@ -41,8 +41,8 @@ class IssueManager {
   void ClearGlobalIssues();
 
   // Removes all unresolved issues with RouteId.
-  // |route_id|: MediaRouteId of the issues to be removed.
-  void ClearIssuesWithRouteId(const MediaRouteId& route_id);
+  // |route_id|: ID of the media route whose issues are to be cleared.
+  void ClearIssuesWithRouteId(const MediaRoute::Id& route_id);
 
   // Registers an issue observer |observer|. The observer will be triggered
   // when the highest priority issue changes.
@@ -67,7 +67,7 @@ class IssueManager {
   base::ObserverList<IssuesObserver> issues_observers_;
 
   // The ID of the current top issue.
-  Issue::IssueId top_issue_id_;
+  Issue::Id top_issue_id_;
 
   base::ThreadChecker thread_checker_;
 
diff --git a/chrome/browser/media/router/media_route.cc b/chrome/browser/media/router/media_route.cc
index f894761ba80776..0aa126f3a21776 100644
--- a/chrome/browser/media/router/media_route.cc
+++ b/chrome/browser/media/router/media_route.cc
@@ -9,7 +9,7 @@
 
 namespace media_router {
 
-MediaRoute::MediaRoute(const MediaRouteId& media_route_id,
+MediaRoute::MediaRoute(const MediaRoute::Id& media_route_id,
                        const MediaSource& media_source,
                        const MediaSink& media_sink,
                        const std::string& description,
diff --git a/chrome/browser/media/router/media_route.h b/chrome/browser/media/router/media_route.h
index 1769a57ee5af61..e8d270ae7dba68 100644
--- a/chrome/browser/media/router/media_route.h
+++ b/chrome/browser/media/router/media_route.h
@@ -10,7 +10,6 @@
 #include "base/gtest_prod_util.h"
 #include "base/logging.h"
 #include "base/values.h"
-#include "chrome/browser/media/router/media_route_id.h"
 #include "chrome/browser/media/router/media_sink.h"
 #include "chrome/browser/media/router/media_source.h"
 #include "url/gurl.h"
@@ -33,13 +32,15 @@ enum MediaRouteState {
 // be retrieved as new MediaRoute objects from the Media Router.
 class MediaRoute {
  public:
+  using Id = std::string;
+
   // |media_route_id|: ID of the route. New route IDs should be created
   //                   by the RouteIdManager class.
   // |media_source|: Description of source of the route.
   // |media_sink|: The sink that is receiving the media.
   // |description|: Description of the route to be displayed.
   // |is_local|: true if the route was created from this browser.
-  MediaRoute(const MediaRouteId& media_route_id,
+  MediaRoute(const MediaRoute::Id& media_route_id,
              const MediaSource& media_source,
              const MediaSink& media_sink,
              const std::string& description,
@@ -47,7 +48,7 @@ class MediaRoute {
   ~MediaRoute();
 
   // The media route identifier.
-  const MediaRouteId& media_route_id() const { return media_route_id_; }
+  const MediaRoute::Id& media_route_id() const { return media_route_id_; }
 
   // The state of the media route.
   MediaRouteState state() const { return state_; }
@@ -70,7 +71,7 @@ class MediaRoute {
   bool Equals(const MediaRoute& other) const;
 
  private:
-  MediaRouteId media_route_id_;
+  MediaRoute::Id media_route_id_;
   MediaSource media_source_;
   MediaSink media_sink_;
   std::string description_;
diff --git a/chrome/browser/media/router/media_route_id.h b/chrome/browser/media/router/media_route_id.h
deleted file mode 100644
index 7bdfb57415459a..00000000000000
--- a/chrome/browser/media/router/media_route_id.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// 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_MEDIA_ROUTE_ID_H_
-#define CHROME_BROWSER_MEDIA_ROUTER_MEDIA_ROUTE_ID_H_
-
-#include <string>
-
-namespace media_router {
-
-using MediaRouteId = std::string;
-
-}  // namespace media_router
-
-#endif  // CHROME_BROWSER_MEDIA_ROUTER_MEDIA_ROUTE_ID_H_
diff --git a/chrome/browser/media/router/media_router.h b/chrome/browser/media/router/media_router.h
index e9ae7189f61a23..0699d3f86bf8c2 100644
--- a/chrome/browser/media/router/media_router.h
+++ b/chrome/browser/media/router/media_router.h
@@ -11,7 +11,6 @@
 #include "base/callback.h"
 #include "chrome/browser/media/router/issue.h"
 #include "chrome/browser/media/router/media_route.h"
-#include "chrome/browser/media/router/media_route_id.h"
 #include "chrome/browser/media/router/media_sink.h"
 #include "chrome/browser/media/router/media_source.h"
 
@@ -40,21 +39,21 @@ class MediaRouter {
 
   // Creates a media route from |source_id| to |sink_id|.
   // |callback| is invoked with a response indicating success or failure.
-  virtual void CreateRoute(const MediaSourceId& source_id,
-                           const MediaSinkId& sink_id,
+  virtual void CreateRoute(const MediaSource::Id& source_id,
+                           const MediaSink::Id& sink_id,
                            const MediaRouteResponseCallback& callback) = 0;
 
   // Closes the media route specified by |route_id|.
-  virtual void CloseRoute(const MediaRouteId& route_id) = 0;
+  virtual void CloseRoute(const MediaRoute::Id& route_id) = 0;
 
   // Posts |message| to a MediaSink connected via MediaRoute with |route_id|.
   // TODO(imcheng): Support additional data types: Blob, ArrayBuffer,
   // ArrayBufferView.
-  virtual void PostMessage(const MediaRouteId& route_id,
+  virtual void PostMessage(const MediaRoute::Id& route_id,
                            const std::string& message) = 0;
 
   // Clears the issue with the id |issue_id|.
-  virtual void ClearIssue(const Issue::IssueId& issue_id) = 0;
+  virtual void ClearIssue(const Issue::Id& issue_id) = 0;
 
   // Receives updates from a MediaRouter instance.
   class Delegate {
@@ -62,7 +61,7 @@ class MediaRouter {
     // Called when there is a message from a route.
     // |route_id|: The route ID.
     // |message|: The message.
-    virtual void OnMessage(const MediaRouteId& route_id,
+    virtual void OnMessage(const MediaRoute::Id& route_id,
                            const std::string& message) = 0;
   };
 
diff --git a/chrome/browser/media/router/media_router_mojo_impl.cc b/chrome/browser/media/router/media_router_mojo_impl.cc
index 8460e2c90a332f..c65700d7299ee8 100644
--- a/chrome/browser/media/router/media_router_mojo_impl.cc
+++ b/chrome/browser/media/router/media_router_mojo_impl.cc
@@ -24,7 +24,7 @@ namespace {
 
 // Converts the callback result of calling Mojo CreateRoute() into a local
 // callback.
-void CreateRouteFinished(const MediaSinkId& sink_id,
+void CreateRouteFinished(const MediaSink::Id& sink_id,
                          const MediaRouteResponseCallback& callback,
                          interfaces::MediaRoutePtr media_route,
                          const mojo::String& error_text) {
@@ -158,8 +158,8 @@ void MediaRouterMojoImpl::OnRoutesUpdated(
 }
 
 void MediaRouterMojoImpl::CreateRoute(
-    const MediaSourceId& source_id,
-    const MediaSinkId& sink_id,
+    const MediaSource::Id& source_id,
+    const MediaSink::Id& sink_id,
     const MediaRouteResponseCallback& callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
@@ -167,14 +167,14 @@ void MediaRouterMojoImpl::CreateRoute(
                         base::Unretained(this), source_id, sink_id, callback));
 }
 
-void MediaRouterMojoImpl::CloseRoute(const MediaRouteId& route_id) {
+void MediaRouterMojoImpl::CloseRoute(const MediaRoute::Id& route_id) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   RunOrDefer(base::Bind(&MediaRouterMojoImpl::DoCloseRoute,
                         base::Unretained(this), route_id));
 }
 
-void MediaRouterMojoImpl::PostMessage(const MediaRouteId& route_id,
+void MediaRouterMojoImpl::PostMessage(const MediaRoute::Id& route_id,
                                       const std::string& message) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
@@ -182,7 +182,7 @@ void MediaRouterMojoImpl::PostMessage(const MediaRouteId& route_id,
                         base::Unretained(this), route_id, message));
 }
 
-void MediaRouterMojoImpl::ClearIssue(const Issue::IssueId& issue_id) {
+void MediaRouterMojoImpl::ClearIssue(const Issue::Id& issue_id) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   RunOrDefer(base::Bind(&MediaRouterMojoImpl::DoClearIssue,
@@ -268,26 +268,26 @@ void MediaRouterMojoImpl::RemoveIssuesObserver(IssuesObserver* observer) {
 }
 
 void MediaRouterMojoImpl::DoCreateRoute(
-    const MediaSourceId& source_id,
-    const MediaSinkId& sink_id,
+    const MediaSource::Id& source_id,
+    const MediaSink::Id& sink_id,
     const MediaRouteResponseCallback& callback) {
   DVLOG_WITH_INSTANCE(1) << "CreateRoute " << source_id << "=>" << sink_id;
   mojo_media_router_->CreateRoute(
       source_id, sink_id, base::Bind(&CreateRouteFinished, sink_id, callback));
 }
 
-void MediaRouterMojoImpl::DoCloseRoute(const MediaRouteId& route_id) {
+void MediaRouterMojoImpl::DoCloseRoute(const MediaRoute::Id& route_id) {
   DVLOG_WITH_INSTANCE(1) << "CloseRoute " << route_id;
   mojo_media_router_->CloseRoute(route_id);
 }
 
-void MediaRouterMojoImpl::DoPostMessage(const MediaRouteId& route_id,
+void MediaRouterMojoImpl::DoPostMessage(const MediaRoute::Id& route_id,
                                         const std::string& message) {
   DVLOG_WITH_INSTANCE(1) << "PostMessage " << route_id;
   mojo_media_router_->PostMessage(route_id, message);
 }
 
-void MediaRouterMojoImpl::DoClearIssue(const Issue::IssueId& issue_id) {
+void MediaRouterMojoImpl::DoClearIssue(const Issue::Id& issue_id) {
   DVLOG_WITH_INSTANCE(1) << "ClearIssue " << issue_id;
   mojo_media_router_->ClearIssue(issue_id);
 }
diff --git a/chrome/browser/media/router/media_router_mojo_impl.h b/chrome/browser/media/router/media_router_mojo_impl.h
index de9db922f22a28..f3bd8e36cf3be1 100644
--- a/chrome/browser/media/router/media_router_mojo_impl.h
+++ b/chrome/browser/media/router/media_router_mojo_impl.h
@@ -59,13 +59,13 @@ class MediaRouterMojoImpl : public MediaRouter,
   // MediaRouter implementation.
   // Execution of the requests is delegated to the Do* methods, which can be
   // enqueued for later use if the extension is temporarily suspended.
-  void CreateRoute(const MediaSourceId& source_id,
-                   const MediaSinkId& sink_id,
+  void CreateRoute(const MediaSource::Id& source_id,
+                   const MediaSink::Id& sink_id,
                    const MediaRouteResponseCallback& callback) override;
-  void CloseRoute(const MediaRouteId& route_id) override;
-  void PostMessage(const MediaRouteId& route_id,
+  void CloseRoute(const MediaRoute::Id& route_id) override;
+  void PostMessage(const MediaRoute::Id& route_id,
                    const std::string& message) override;
-  void ClearIssue(const Issue::IssueId& issue_id) override;
+  void ClearIssue(const Issue::Id& issue_id) override;
   void RegisterMediaSinksObserver(MediaSinksObserver* observer) override;
   void UnregisterMediaSinksObserver(MediaSinksObserver* observer) override;
   void RegisterMediaRoutesObserver(MediaRoutesObserver* observer) override;
@@ -107,12 +107,13 @@ class MediaRouterMojoImpl : public MediaRouter,
   void ExecutePendingRequests();
 
   // These calls invoke methods in the component extension via Mojo.
-  void DoCreateRoute(const MediaSourceId& source_id,
-                     const MediaSinkId& sink_id,
+  void DoCreateRoute(const MediaSource::Id& source_id,
+                     const MediaSink::Id& sink_id,
                      const MediaRouteResponseCallback& callback);
-  void DoCloseRoute(const MediaRouteId& route_id);
-  void DoPostMessage(const MediaRouteId& route_id, const std::string& message);
-  void DoClearIssue(const Issue::IssueId& issue_id);
+  void DoCloseRoute(const MediaRoute::Id& route_id);
+  void DoPostMessage(const MediaRoute::Id& route_id,
+                     const std::string& message);
+  void DoClearIssue(const Issue::Id& issue_id);
   void DoStartObservingMediaSinks(const std::string& source_id);
   void DoStopObservingMediaSinks(const std::string& source_id);
   void DoStartObservingMediaRoutes();
@@ -139,7 +140,7 @@ class MediaRouterMojoImpl : public MediaRouter,
   // becomes ready.
   std::vector<base::Closure> pending_requests_;
 
-  base::ScopedPtrHashMap<MediaSourceId,
+  base::ScopedPtrHashMap<MediaSource::Id,
                          scoped_ptr<base::ObserverList<MediaSinksObserver>>>
       sinks_observers_;
 
diff --git a/chrome/browser/media/router/media_sink.cc b/chrome/browser/media/router/media_sink.cc
index 18c3f5192ace82..4924140ce0e86b 100644
--- a/chrome/browser/media/router/media_sink.cc
+++ b/chrome/browser/media/router/media_sink.cc
@@ -6,7 +6,7 @@
 
 namespace media_router {
 
-MediaSink::MediaSink(const MediaSinkId& sink_id, const std::string& name)
+MediaSink::MediaSink(const MediaSink::Id& sink_id, const std::string& name)
     : sink_id_(sink_id), name_(name) {
 }
 
diff --git a/chrome/browser/media/router/media_sink.h b/chrome/browser/media/router/media_sink.h
index 25d75c10f1fc84..face195ba403e1 100644
--- a/chrome/browser/media/router/media_sink.h
+++ b/chrome/browser/media/router/media_sink.h
@@ -7,21 +7,18 @@
 
 #include <string>
 
-#include "chrome/browser/media/router/media_route_id.h"
-
 namespace media_router {
 
-using MediaSinkId = std::string;
-
 // Represents a sink to which media can be routed.
 class MediaSink {
  public:
-  MediaSink(const MediaSinkId& sink_id,
-            const std::string& name);
+  using Id = std::string;
+
+  MediaSink(const MediaSink::Id& sink_id, const std::string& name);
 
   ~MediaSink();
 
-  const MediaSinkId& id() const { return sink_id_; }
+  const MediaSink::Id& id() const { return sink_id_; }
   const std::string& name() const { return name_; }
 
   bool Equals(const MediaSink& other) const;
@@ -29,7 +26,7 @@ class MediaSink {
 
  private:
   // Unique identifier for the MediaSink.
-  MediaSinkId sink_id_;
+  MediaSink::Id sink_id_;
   // Descriptive name of the MediaSink.
   // Optional, can use an empty string if no sink name is available.
   std::string name_;
diff --git a/chrome/browser/media/router/media_source.cc b/chrome/browser/media/router/media_source.cc
index 6342188f96f5ff..87b4d78788759b 100644
--- a/chrome/browser/media/router/media_source.cc
+++ b/chrome/browser/media/router/media_source.cc
@@ -8,7 +8,7 @@
 
 namespace media_router {
 
-MediaSource::MediaSource(const MediaSourceId& source_id) : id_(source_id) {
+MediaSource::MediaSource(const MediaSource::Id& source_id) : id_(source_id) {
 }
 
 MediaSource::MediaSource() {
@@ -16,7 +16,7 @@ MediaSource::MediaSource() {
 
 MediaSource::~MediaSource() {}
 
-MediaSourceId MediaSource::id() const {
+MediaSource::Id MediaSource::id() const {
   return id_;
 }
 
diff --git a/chrome/browser/media/router/media_source.h b/chrome/browser/media/router/media_source.h
index 00c3ebc79f76ff..8943f3f9079d42 100644
--- a/chrome/browser/media/router/media_source.h
+++ b/chrome/browser/media/router/media_source.h
@@ -12,16 +12,17 @@
 
 namespace media_router {
 
-using MediaSourceId = std::string;
 
 class MediaSource {
  public:
-  explicit MediaSource(const MediaSourceId& id);
+  using Id = std::string;
+
+  explicit MediaSource(const MediaSource::Id& id);
   MediaSource();
   ~MediaSource();
 
   // Gets the ID of the media source.
-  MediaSourceId id() const;
+  MediaSource::Id id() const;
 
   // Returns true if two MediaSource objects use the same media ID.
   bool Equals(const MediaSource& other) const;
@@ -40,7 +41,7 @@ class MediaSource {
   };
 
  private:
-  MediaSourceId id_;
+  MediaSource::Id id_;
 };
 
 }  // namespace media_router
diff --git a/chrome/browser/media/router/mock_media_router.h b/chrome/browser/media/router/mock_media_router.h
index 6c1d6a8472a2a3..c093a0e99cb87c 100644
--- a/chrome/browser/media/router/mock_media_router.h
+++ b/chrome/browser/media/router/mock_media_router.h
@@ -24,13 +24,14 @@ class MockMediaRouter : public MediaRouter {
   virtual ~MockMediaRouter();
 
   MOCK_METHOD3(CreateRoute,
-               void(const MediaSourceId& source_id,
-                    const MediaSinkId& sink_id,
+               void(const MediaSource::Id& source,
+                    const MediaSink::Id& sink_id,
                     const MediaRouteResponseCallback& callback));
-  MOCK_METHOD1(CloseRoute, void(const MediaRouteId& route_id));
+  MOCK_METHOD1(CloseRoute, void(const MediaRoute::Id& route_id));
   MOCK_METHOD2(PostMessage,
-               void(const MediaRouteId& route_id, const std::string& message));
-  MOCK_METHOD1(ClearIssue, void(const Issue::IssueId& issue_id));
+               void(const MediaRoute::Id& route_id,
+                    const std::string& message));
+  MOCK_METHOD1(ClearIssue, void(const Issue::Id& issue_id));
   MOCK_METHOD1(AddIssuesObserver, void(IssuesObserver* observer));
   MOCK_METHOD1(RemoveIssuesObserver, void(IssuesObserver* observer));
 
diff --git a/chrome/browser/media/router/presentation_service_delegate_impl.cc b/chrome/browser/media/router/presentation_service_delegate_impl.cc
index 21252920bee36e..ebe434d4e8e8d0 100644
--- a/chrome/browser/media/router/presentation_service_delegate_impl.cc
+++ b/chrome/browser/media/router/presentation_service_delegate_impl.cc
@@ -31,11 +31,10 @@ using content::RenderFrameHost;
 
 namespace media_router {
 
-using RenderFrameHostId = std::pair<int, int>;
-
 namespace {
 
 using DelegateObserver = content::PresentationServiceDelegate::Observer;
+using RenderFrameHostId = std::pair<int, int>;
 
 // Returns the unique identifier for the supplied RenderViewHost.
 RenderFrameHostId GetRenderFrameHostId(RenderFrameHost* render_view_host) {
@@ -72,7 +71,7 @@ class PresentationFrame {
   bool RemoveScreenAvailabilityListener(
       content::PresentationScreenAvailabilityListener* listener);
   bool HasScreenAvailabilityListenerForTest(
-      const MediaSourceId& source_id) const;
+      const MediaSource::Id& source_id) const;
   void SetDefaultPresentationInfo(const std::string& default_presentation_url,
                                   const std::string& default_presentation_id);
   std::string GetDefaultPresentationId() const;
@@ -144,7 +143,7 @@ bool PresentationFrame::RemoveScreenAvailabilityListener(
 }
 
 bool PresentationFrame::HasScreenAvailabilityListenerForTest(
-    const MediaSourceId& source_id) const {
+    const MediaSource::Id& source_id) const {
   return sinks_observer_ && sinks_observer_->source().id() == source_id;
 }
 
@@ -202,7 +201,7 @@ class PresentationFrameManager {
   void Reset(const RenderFrameHostId& render_frame_host_id);
   bool HasScreenAvailabilityListenerForTest(
       const RenderFrameHostId& render_frame_host_id,
-      const MediaSourceId& source_id) const;
+      const MediaSource::Id& source_id) const;
   void SetMediaRouterForTest(MediaRouter* router);
 
   // Returns default presentation ID, or empty string if no default
@@ -268,7 +267,7 @@ bool PresentationFrameManager::RemoveScreenAvailabilityListener(
 
 bool PresentationFrameManager::HasScreenAvailabilityListenerForTest(
     const RenderFrameHostId& render_frame_host_id,
-    const MediaSourceId& source_id) const {
+    const MediaSource::Id& source_id) const {
   auto presentation_frame = presentation_frames_.get(render_frame_host_id);
   return presentation_frame &&
          presentation_frame->HasScreenAvailabilityListenerForTest(source_id);
@@ -507,7 +506,7 @@ PresentationServiceDelegateImpl::GetWeakPtr() {
 bool PresentationServiceDelegateImpl::HasScreenAvailabilityListenerForTest(
     int render_process_id,
     int render_frame_id,
-    const MediaSourceId& source_id) const {
+    const MediaSource::Id& source_id) const {
   RenderFrameHostId render_frame_host_id(render_process_id, render_frame_id);
   return frame_manager_->HasScreenAvailabilityListenerForTest(
       render_frame_host_id, source_id);
diff --git a/chrome/browser/media/router/presentation_service_delegate_impl.h b/chrome/browser/media/router/presentation_service_delegate_impl.h
index 7648cd14437da0..3e822cbde027ec 100644
--- a/chrome/browser/media/router/presentation_service_delegate_impl.h
+++ b/chrome/browser/media/router/presentation_service_delegate_impl.h
@@ -124,7 +124,7 @@ class PresentationServiceDelegateImpl
   bool HasScreenAvailabilityListenerForTest(
       int render_process_id,
       int render_frame_id,
-      const MediaSourceId& source_id) const;
+      const MediaSource::Id& source_id) const;
 
   base::WeakPtr<PresentationServiceDelegateImpl> GetWeakPtr();
 
diff --git a/chrome/browser/ui/webui/media_router/media_router_ui.cc b/chrome/browser/ui/webui/media_router/media_router_ui.cc
index 11078b4847bbaf..9c96f70a36c57c 100644
--- a/chrome/browser/ui/webui/media_router/media_router_ui.cc
+++ b/chrome/browser/ui/webui/media_router/media_router_ui.cc
@@ -107,19 +107,19 @@ void MediaRouterUI::UIInitialized() {
   ui_initialized_ = true;
 }
 
-bool MediaRouterUI::CreateRoute(const MediaSinkId& sink_id) {
+bool MediaRouterUI::CreateRoute(const MediaSink::Id& sink_id) {
   return DoCreateRoute(sink_id, GetPreferredCastMode(cast_modes_));
 }
 
 bool MediaRouterUI::CreateRouteWithCastModeOverride(
-    const MediaSinkId& sink_id,
+    const MediaSink::Id& sink_id,
     MediaCastMode cast_mode_override) {
   // NOTE: It's actually not an override if
   // |cast_mode_override| == |GetPreferredCastMode(cast_modes_)|.
   return DoCreateRoute(sink_id, cast_mode_override);
 }
 
-void MediaRouterUI::CloseRoute(const MediaRouteId& route_id) {
+void MediaRouterUI::CloseRoute(const MediaRoute::Id& route_id) {
   router_->CloseRoute(route_id);
 }
 
@@ -165,7 +165,7 @@ void MediaRouterUI::OnRouteResponseReceived(scoped_ptr<MediaRoute> route,
   has_pending_route_request_ = false;
 }
 
-bool MediaRouterUI::DoCreateRoute(const MediaSinkId& sink_id,
+bool MediaRouterUI::DoCreateRoute(const MediaSink::Id& sink_id,
                                   MediaCastMode cast_mode) {
   DCHECK(query_result_manager_.get());
 
diff --git a/chrome/browser/ui/webui/media_router/media_router_ui.h b/chrome/browser/ui/webui/media_router/media_router_ui.h
index 1eb1db1ded8104..33768defa99820 100644
--- a/chrome/browser/ui/webui/media_router/media_router_ui.h
+++ b/chrome/browser/ui/webui/media_router/media_router_ui.h
@@ -42,19 +42,19 @@ class MediaRouterUI : public ConstrainedWebDialogUI,
   // Returns false if unable to request the route.
   // |OnRouteResponseReceived()| will be invoked when the route request
   // completes.
-  bool CreateRoute(const MediaSinkId& sink_id);
+  bool CreateRoute(const MediaSink::Id& sink_id);
 
   // Requests a route be created from the source mapped to
   // |cast_mode_override|, to the sink given by |sink_id|.
   // Returns true if a route request is successfully submitted.
-  bool CreateRouteWithCastModeOverride(const MediaSinkId& sink_id,
+  bool CreateRouteWithCastModeOverride(const MediaSink::Id& sink_id,
                                        MediaCastMode cast_mode_override);
 
   // Calls MediaRouter to close the given route.
-  void CloseRoute(const MediaRouteId& route_id);
+  void CloseRoute(const MediaRoute::Id& route_id);
 
   // Calls MediaRouter to clear the given issue.
-  void ClearIssue(const Issue::IssueId& issue_id);
+  void ClearIssue(const Issue::Id& issue_id);
 
   // Returns the header text that should be displayed in the UI when it is
   // initially loaded. The header text is determined by the preferred cast mode.
@@ -86,7 +86,7 @@ class MediaRouterUI : public ConstrainedWebDialogUI,
   void OnRouteResponseReceived(scoped_ptr<MediaRoute> route,
                                const std::string& error);
 
-  bool DoCreateRoute(const MediaSinkId& sink_id, MediaCastMode cast_mode);
+  bool DoCreateRoute(const MediaSink::Id& sink_id, MediaCastMode cast_mode);
 
   // Owned by the |web_ui| passed in the ctor, and guaranteed to be deleted
   // only after it has deleted |this|.
diff --git a/chrome/browser/ui/webui/media_router/query_result_manager.cc b/chrome/browser/ui/webui/media_router/query_result_manager.cc
index b0e27fe1c0ae98..f7d458894f8084 100644
--- a/chrome/browser/ui/webui/media_router/query_result_manager.cc
+++ b/chrome/browser/ui/webui/media_router/query_result_manager.cc
@@ -39,7 +39,7 @@ class QueryResultManager::CastModeMediaSinksObserver
   }
 
   // Returns the most recent sink IDs that were passed to |OnSinksReceived|.
-  void GetLatestSinkIds(std::vector<MediaSinkId>* sink_ids) const {
+  void GetLatestSinkIds(std::vector<MediaSink::Id>* sink_ids) const {
     DCHECK(sink_ids);
     *sink_ids = latest_sink_ids_;
   }
@@ -48,7 +48,7 @@ class QueryResultManager::CastModeMediaSinksObserver
 
  private:
   MediaCastMode cast_mode_;
-  std::vector<MediaSinkId> latest_sink_ids_;
+  std::vector<MediaSink::Id> latest_sink_ids_;
   QueryResultManager* result_manager_;
 };
 
@@ -119,7 +119,7 @@ bool QueryResultManager::IsValid(const MediaSinkWithCastModes& entry) const {
 void QueryResultManager::UpdateWithSinksQueryResult(
     MediaCastMode cast_mode,
     const std::vector<MediaSink>& result) {
-  base::hash_set<MediaSinkId> result_sink_ids;
+  base::hash_set<MediaSink::Id> result_sink_ids;
   for (const MediaSink& sink : result)
     result_sink_ids.insert(sink.id());
 
diff --git a/chrome/browser/ui/webui/media_router/query_result_manager.h b/chrome/browser/ui/webui/media_router/query_result_manager.h
index abe6e0011ba4c3..0e2c4bf0d19a6a 100644
--- a/chrome/browser/ui/webui/media_router/query_result_manager.h
+++ b/chrome/browser/ui/webui/media_router/query_result_manager.h
@@ -130,7 +130,7 @@ class QueryResultManager {
   std::map<MediaCastMode, MediaSource> cast_mode_sources_;
 
   // Holds all known sinks and their associated cast modes.
-  std::map<MediaSinkId, MediaSinkWithCastModes> all_sinks_;
+  std::map<MediaSink::Id, MediaSinkWithCastModes> all_sinks_;
 
   // Registered observers.
   base::ObserverList<Observer> observers_;