Pipe the devTools FrameId from blink into the browser for headless

content/browser/frame_host/render_frame_host_impl.h

 // Copyright 2013 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 CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 597 matching lines @@
   // that made a network request. The PreviewsState is a bitmask of potentially
   // several Previews optimizations.
   PreviewsState last_navigation_previews_state() const {
     return last_navigation_previews_state_;
   }
 
   bool has_focused_editable_element() const {
     return has_focused_editable_element_;
   }
 
+  const std::string& devtools_frame_id() const { return devtools_frame_id_; }

[Charlie Reis, 2017/04/26 19:52:55]

This should have a comment saying when it's set, that it's untrusted, and that
we plan to remove it (with a TODO referencing the bug).

[alex clarke (OOO till 29th), 2017/04/27 08:49:43]

Done.

+
   // Cancels any blocked request for the frame and its subframes.
   void CancelBlockedRequestsForFrame();
 
 #if defined(OS_ANDROID)
   base::android::ScopedJavaLocalRef<jobject> GetJavaRenderFrameHost();
   service_manager::InterfaceProvider* GetJavaInterfaces() override;
 #endif
 
  protected:
   friend class RenderFrameHostFactory;
@@ skipping 137 matching lines @@
       int job_id,
       MhtmlSaveStatus save_status,
       const std::set<std::string>& digests_of_uris_of_serialized_resources,
       base::TimeDelta renderer_main_thread_time);
   void OnSelectionChanged(const base::string16& text,
                           uint32_t offset,
                           const gfx::Range& range);
   void OnFocusedNodeChanged(bool is_editable_element,
                             const gfx::Rect& bounds_in_frame_widget);
   void OnSetHasReceivedUserGesture();
+  void OnSetDevToolsFrameId(const std::string& devtools_frame_id);
 
 #if BUILDFLAG(USE_EXTERNAL_POPUP_MENU)
   void OnShowPopup(const FrameHostMsg_ShowPopup_Params& params);
   void OnHidePopup();
 #endif
 #if defined(OS_ANDROID)
   void OnNavigationHandledByEmbedder();
   void ForwardGetInterfaceToRenderFrame(const std::string& interface_name,
                                         mojo::ScopedMessagePipeHandle pipe);
 #endif
@@ skipping 392 matching lines @@
   // this RenderFrameHost. This provides access to interfaces implemented in
   // Java in the browser process to C++ code in the browser process.
   std::unique_ptr<service_manager::InterfaceProvider> java_interfaces_;
 
   // An InterfaceRegistry that forwards interface requests from Java to the
   // RenderFrame. This provides access to interfaces implemented in the renderer
   // to Java code in the browser process.
   std::unique_ptr<service_manager::InterfaceRegistry> java_interface_registry_;
 #endif
 
+  std::string devtools_frame_id_;

[Charlie Reis, 2017/04/26 19:52:55]

Similar comment, or at least the TODO about removing it.

[alex clarke (OOO till 29th), 2017/04/27 08:49:43]

Done.

+
   // NOTE: This must be the last member.
   base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_