[Media Router] Move main frame check for SetDefaultPresentationUrls.

chrome/browser/media/router/presentation_service_delegate_impl.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/media/router/presentation_service_delegate_impl.h"
 
 #include <string>
 #include <unordered_map>
 #include <utility>
 #include <vector>
@@ skipping 33 matching lines @@
     media_router::PresentationServiceDelegateImpl);
 
 using content::RenderFrameHost;
 
 namespace media_router {
 
 namespace {
 
 using DelegateObserver = content::PresentationServiceDelegate::Observer;
 
-// Returns the unique identifier for the supplied RenderFrameHost.
-RenderFrameHostId GetRenderFrameHostId(RenderFrameHost* render_frame_host) {
-  int render_process_id = render_frame_host->GetProcess()->GetID();
-  int render_frame_id = render_frame_host->GetRoutingID();
-  return RenderFrameHostId(render_process_id, render_frame_id);
-}
-
 // Gets the last committed URL for the render frame specified by
 // |render_frame_host_id|.
 url::Origin GetLastCommittedURLForFrame(
     RenderFrameHostId render_frame_host_id) {
   RenderFrameHost* render_frame_host = RenderFrameHost::FromID(
       render_frame_host_id.first, render_frame_host_id.second);
   DCHECK(render_frame_host);
   return render_frame_host->GetLastCommittedOrigin();
 }
 
@@ skipping 305 matching lines @@
   }
   return presentation_frame.get();
 }
 
 void PresentationServiceDelegateImpl::SetDefaultPresentationUrls(
     int render_process_id,
     int render_frame_id,
     const std::vector<GURL>& default_presentation_urls,
     content::DefaultPresentationConnectionCallback callback) {
   RenderFrameHostId render_frame_host_id(render_process_id, render_frame_id);
-  if (!IsMainFrame(render_frame_host_id))
-    return;
-
   if (default_presentation_urls.empty()) {
     ClearDefaultPresentationRequest();
     return;
   }
 
   DCHECK(!callback.is_null());
   auto frame_origin = GetLastCommittedURLForFrame(render_frame_host_id);
   PresentationRequest request(render_frame_host_id, default_presentation_urls,
                               frame_origin);
   default_presentation_started_callback_ = std::move(callback);
@@ skipping 336 matching lines @@
 void PresentationServiceDelegateImpl::ClearDefaultPresentationRequest() {
   default_presentation_started_callback_.Reset();
   if (!default_presentation_request_)
     return;
 
   default_presentation_request_.reset();
   for (auto& observer : default_presentation_request_observers_)
     observer.OnDefaultPresentationRemoved();
 }
 
-// TODO(imcheng): Move this check to PresentationServiceImpl.
-bool PresentationServiceDelegateImpl::IsMainFrame(
-    const RenderFrameHostId& render_frame_host_id) const {
-  RenderFrameHost* main_frame = web_contents_->GetMainFrame();
-  return main_frame && GetRenderFrameHostId(main_frame) == render_frame_host_id;
-}
-
 MediaRoute::Id PresentationServiceDelegateImpl::GetRouteId(
     const RenderFrameHostId& render_frame_host_id,
     const std::string& presentation_id) const {
   const auto it = presentation_frames_.find(render_frame_host_id);
   return it != presentation_frames_.end()
              ? it->second->GetRouteId(presentation_id)
              : MediaRoute::Id();
 }
 
 #if !defined(OS_ANDROID)
 bool PresentationServiceDelegateImpl::ShouldCancelAutoJoinForOrigin(
     const url::Origin& origin) const {
   const base::ListValue* origins =
       Profile::FromBrowserContext(web_contents_->GetBrowserContext())
           ->GetPrefs()
           ->GetList(prefs::kMediaRouterTabMirroringSources);
   return origins &&
          origins->Find(base::Value(origin.Serialize())) != origins->end();
 }
 #endif  // !defined(OS_ANDROID)
 
 }  // namespace media_router