[Media Router] Implement JoinRoute + update CreateRoute API.

chrome/browser/ui/webui/media_router/media_router_ui.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 "chrome/browser/ui/webui/media_router/media_router_ui.h"
 
 #include <string>
 
 #include "base/strings/string_util.h"
 #include "chrome/browser/media/router/create_session_request.h"
@@ skipping 18 matching lines @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "ui/web_dialogs/web_dialog_delegate.h"
 
 namespace media_router {
 
 namespace {
 
 std::string GetHostFromURL(const GURL& gurl) {
+  if (gurl.is_empty())
+    return std::string();
   std::string host = gurl.host();
   if (StartsWithASCII(host, "www.", false))
     host = host.substr(4);
   return host;
 }
 
 }  // namespace
 
 // This class calls to refresh the UI when the highest priority issue is
 // updated.
@@ skipping 239 matching lines @@
     }
   }
 
   has_pending_route_request_ = false;
   requesting_route_for_default_source_ = false;
 }
 
 bool MediaRouterUI::DoCreateRoute(const MediaSink::Id& sink_id,
                                   MediaCastMode cast_mode) {
   DCHECK(query_result_manager_.get());
+  DCHECK(initiator_);
 
   // Note that there is a rarely-encountered bug, where the MediaCastMode to
   // MediaSource mapping could have been updated, between when the user
   // clicked on the UI to start a create route request,
   // and when this function is called.
   // However, since the user does not have visibility into the MediaSource, and
   // that it occurs very rarely in practice, we leave it as-is for now.
   MediaSource source = query_result_manager_->GetSourceForCastMode(cast_mode);
   if (source.Empty()) {
     LOG(ERROR) << "No corresponding MediaSource for cast mode " << cast_mode;
     return false;
   }
 
   has_pending_route_request_ = true;
   requesting_route_for_default_source_ = cast_mode == MediaCastMode::DEFAULT;
-  router_->CreateRoute(source.id(), sink_id,
+  GURL origin;
+  // TODO(imcheng): What is the origin if not creating route in DEFAULT mode?

[mark a. foltz, 2015/06/10 23:18:51]

If the user is e.g. initiating tab mirroring it should probably be
chrome://media-router/

[imcheng (use chromium acct), 2015/06/11 22:49:12]

Done.

+  if (requesting_route_for_default_source_) {
+    origin = frame_url_.GetOrigin();
+    DCHECK(origin.is_valid());
+  }
+  DVLOG(1) << "DoCreateRoute: origin: " << origin;
+
+  router_->CreateRoute(source.id(), sink_id, origin,
+                       SessionTabHelper::IdForTab(initiator_),
                        base::Bind(&MediaRouterUI::OnRouteResponseReceived,
                                   weak_factory_.GetWeakPtr()));
   return true;
 }
 
+std::string MediaRouterUI::GetFrameURLHost() const {
+  return GetHostFromURL(frame_url_);
+}
+
 }  // namespace media_router