[Media Router] Convert MediaRouter to use GURL for presentation URLs.

chrome/browser/media/router/media_source_helper.cc

Index: chrome/browser/media/router/media_source_helper.cc
diff --git a/chrome/browser/media/router/media_source_helper.cc b/chrome/browser/media/router/media_source_helper.cc
index 73517d2c9fb12df6b15bdb9076b6e8e246785647..7ab96e7cccaee3c2f938573f98c299cdf891383f 100644
--- a/chrome/browser/media/router/media_source_helper.cc
+++ b/chrome/browser/media/router/media_source_helper.cc
@@ -20,6 +20,7 @@ namespace {
 // See: https://www.ietf.org/rfc/rfc3406.txt
 constexpr char kTabMediaUrnFormat[] = "urn:x-org.chromium.media:source:tab:%d";
 constexpr char kDesktopMediaUrn[] = "urn:x-org.chromium.media:source:desktop";
+// TODO(mfoltz): Is kCastUrnPrefix still used?

[imcheng, 2016/10/07 00:38:36]

Seems not. I only see it and MediaSourceForCastApp used in tests....

[mark a. foltz, 2016/10/07 23:14:10]

Removed, and updated unittests.

 constexpr char kCastUrnPrefix[] = "urn:x-com.google.cast:application:";
 constexpr char kTabRemotingUrnFormat[] =
     "urn:x-org.chromium.media:source:tab_content_remoting:%d";
@@ -44,7 +45,7 @@ MediaSource MediaSourceForCastApp(const std::string& app_id) {
   return MediaSource(kCastUrnPrefix + app_id);
 }
 
-MediaSource MediaSourceForPresentationUrl(const std::string& presentation_url) {
+MediaSource MediaSourceForPresentationUrl(const GURL& presentation_url) {
   return MediaSource(presentation_url);
 }
 
@@ -75,20 +76,15 @@ int TabIdFromMediaSource(const MediaSource& source) {
 }
 
 bool IsValidMediaSource(const MediaSource& source) {
-  return (TabIdFromMediaSource(source) > 0 ||
-          IsDesktopMirroringMediaSource(source) ||
-          base::StartsWith(source.id(), kCastUrnPrefix,
-                           base::CompareCase::SENSITIVE) ||
-          IsValidPresentationUrl(source.id()));
+  return TabIdFromMediaSource(source) > 0 ||
+         IsDesktopMirroringMediaSource(source) ||
+         base::StartsWith(source.id(), kCastUrnPrefix,
+                          base::CompareCase::SENSITIVE) ||
+         IsValidPresentationUrl(GURL(source.id()));
 }
 
-std::string PresentationUrlFromMediaSource(const MediaSource& source) {
-  return IsValidPresentationUrl(source.id()) ? source.id() : "";
-}
-
-bool IsValidPresentationUrl(const std::string& url) {
-  GURL gurl(url);
-  return gurl.is_valid() && gurl.SchemeIsHTTPOrHTTPS();
+bool IsValidPresentationUrl(const GURL& url) {
+  return url.is_valid() && url.SchemeIsHTTPOrHTTPS();
 }
 
 }  // namespace media_router