Headless: Remove obsolete Mojo code and some other obsolete APIs

headless/public/util/generic_url_request_job.cc

 // Copyright 2016 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 "headless/public/util/generic_url_request_job.h"
 
 #include <string.h>
 #include <algorithm>
 
 #include "base/logging.h"
@@ skipping 184 matching lines @@
 
 const net::URLRequest* GenericURLRequestJob::GetURLRequest() const {
   return request_;
 }
 
 int GenericURLRequestJob::GetFrameTreeNodeId() const {
   // URLRequestUserData will be set for all renderer initiated resource
   // requests, but not for browser side navigations.
   int render_process_id;
   int render_frame_routing_id;
-  if (content::ResourceRequestInfo::GetRenderFrameForRequest(
+  if (headless_browser_context_ &&

[Sami, 2017/05/05 16:57:13]

Is this now always guaranteed to be non-null?

[alex clarke (OOO till 29th), 2017/05/08 10:08:22]

Yes it should be.

+      content::ResourceRequestInfo::GetRenderFrameForRequest(
           request_, &render_process_id, &render_frame_routing_id) &&
       render_process_id != -1) {
-    if (headless_browser_context_) {
-      return static_cast<HeadlessBrowserContextImpl*>(headless_browser_context_)
-          ->GetFrameTreeNodeId(render_process_id, render_frame_routing_id);
-    }
-    // TODO(alexclarke): Remove this.
-    content::RenderFrameHost* render_frame_host =
-        content::RenderFrameHost::FromID(render_process_id,
-                                         render_frame_routing_id);
-    DCHECK(render_frame_host);
-    return render_frame_host->GetFrameTreeNodeId();
+    return static_cast<HeadlessBrowserContextImpl*>(headless_browser_context_)
+        ->GetFrameTreeNodeId(render_process_id, render_frame_routing_id);
   }
   // ResourceRequestInfo::GetFrameTreeNodeId is only set for browser side
   // navigations.
   if (request_resource_info_)
     return request_resource_info_->GetFrameTreeNodeId();
 
   // This should only happen in tests.
   return -1;
 }
 
@@ skipping 127 matching lines @@
   }
 
   mock_response_ = std::move(mock_response);
 
   OnFetchCompleteExtractHeaders(request_->url(),
                                 mock_response_->response_data.data(),
                                 mock_response_->response_data.size());
 }
 
 }  // namespace headless