Headless: Remove obsolete Mojo code and some other obsolete APIs

headless/public/headless_web_contents.h

 // 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.
 
 #ifndef HEADLESS_PUBLIC_HEADLESS_WEB_CONTENTS_H_
 #define HEADLESS_PUBLIC_HEADLESS_WEB_CONTENTS_H_
 
 #include <list>
 #include <string>
 #include <utility>
@@ skipping 65 matching lines @@
   // won't return a valid value until Observer::DevToolsTargetReady has been
   // signaled.
   virtual HeadlessDevToolsTarget* GetDevToolsTarget() = 0;
 
   // Close this page. |HeadlessWebContents| object will be destroyed.
   virtual void Close() = 0;
 
   // Returns the headless tab socket for JS -> C++ if one was created.
   virtual HeadlessTabSocket* GetHeadlessTabSocket() const = 0;
 
-  // Returns the FrameTreeNode Id associated with the |devtools_agent_host_id|
-  // if any.
-  // TODO(alexclarke): Remove this, it doesn't work as expected.
-  virtual bool GetFrameTreeNodeIdForDevToolsAgentHostId(
-      const std::string& devtools_agent_host_id,
-      int* frame_tree_node_id) const = 0;
-
   // Returns the devtools frame id corresponding to the |frame_tree_node_id|, if
   // any. Note this relies on an IPC sent from blink during navigation.
   virtual std::string GetUntrustedDevToolsFrameIdForFrameTreeNodeId(
       int process_id,
       int frame_tree_node_id) const = 0;
 
   virtual int GetMainFrameRenderProcessId() const = 0;
 
  private:
   friend class HeadlessWebContentsImpl;
   HeadlessWebContents() {}
 
   DISALLOW_COPY_AND_ASSIGN(HeadlessWebContents);
 };
 
 class HEADLESS_EXPORT HeadlessWebContents::Builder {
  public:
   ~Builder();
   Builder(Builder&&);
 
   // Set an initial URL to ensure that the renderer gets initialized and
   // eventually becomes ready to be inspected. See
   // HeadlessWebContents::Observer::DevToolsTargetReady. The default URL is
   // about:blank.
   Builder& SetInitialURL(const GURL& initial_url);
 
   // Specify the initial window size (default is configured in browser options).
   Builder& SetWindowSize(const gfx::Size& size);
 
-  // DEPRECATED. Specify an embedder provided Mojo service to be installed.  The
-  // |service_factory| callback is called on demand by Mojo to instantiate the
-  // service if a client asks for it.
-  // TODO(alexclarke): Remove AddMojoService.
-  template <typename Interface>
-  Builder& AddMojoService(
-      const base::Callback<void(mojo::InterfaceRequest<Interface>)>&
-          service_factory) {
-    return AddMojoService(
-        Interface::Name_,
-        base::Bind(&Builder::ForwardToServiceFactory<Interface>,
-                   service_factory));
-  }
-  Builder& AddMojoService(const std::string& service_name,
-                          const base::Callback<void(
-                              mojo::ScopedMessagePipeHandle)>& service_factory);
-
   // Whether or not a headless tab socket should be created, to allow JS -> C++
   // embedder communications.
   Builder& CreateTabSocket(bool create_tab_socket);
 
   // The returned object is owned by HeadlessBrowser. Call
   // HeadlessWebContents::Close() to dispose it.
   HeadlessWebContents* Build();
 
  private:
   friend class HeadlessBrowserImpl;
@@ skipping 30 matching lines @@
   gfx::Size window_size_;
   std::list<MojoService> mojo_services_;
   bool create_tab_socket_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(Builder);
 };
 
 }  // namespace headless
 
 #endif  // HEADLESS_PUBLIC_HEADLESS_WEB_CONTENTS_H_