Override CloseContents in HeadlessWebContentsImpl Delegate so that the json/close endpoint works wi…

headless/lib/browser/headless_web_contents_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 "headless/lib/browser/headless_web_contents_impl.h"
 
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 84 matching lines @@
         false /* used_policy_installed_certificate */,
         base::Bind(&content::IsOriginSecure), &security_info);
     return security_state::GetSecurityStyle(security_info,
                                             security_style_explanations);
   }
 
   void ActivateContents(content::WebContents* contents) override {
     contents->GetRenderViewHost()->GetWidget()->Focus();
   }
 
+  void CloseContents(content::WebContents* source) override {
+    if (!browser_context_) {
+      return;
+    }
+
+    std::vector<HeadlessWebContents*> all_contents =
+        browser_context_->GetAllWebContents();
+
+    for (HeadlessWebContents* wc : all_contents) {
+      if (!wc) {
+        continue;
+      }
+      HeadlessWebContentsImpl* hwc = HeadlessWebContentsImpl::From(wc);
+      if (hwc->web_contents() == source) {
+        wc->Close();
+        return;
+      }
+    }
+  }
+
  private:
   HeadlessBrowserContextImpl* browser_context_;  // Not owned.
   DISALLOW_COPY_AND_ASSIGN(Delegate);
 };
 
 // static
 std::unique_ptr<HeadlessWebContentsImpl> HeadlessWebContentsImpl::Create(
     HeadlessWebContents::Builder* builder) {
   content::WebContents::CreateParams create_params(builder->browser_context_,
                                                    nullptr);
@@ skipping 35 matching lines @@
           new HeadlessWebContentsImpl::Delegate(browser_context)),
       web_contents_(web_contents),
       agent_host_(content::DevToolsAgentHost::GetOrCreateFor(web_contents)),
       browser_context_(browser_context),
       render_process_host_(web_contents->GetRenderProcessHost()) {
   web_contents_->SetDelegate(web_contents_delegate_.get());
   render_process_host_->AddObserver(this);
 }
 
 HeadlessWebContentsImpl::~HeadlessWebContentsImpl() {
-  web_contents_->Close();
   if (render_process_host_)
     render_process_host_->RemoveObserver(this);
 }
 
 void HeadlessWebContentsImpl::RenderFrameCreated(
     content::RenderFrameHost* render_frame_host) {
   if (!mojo_services_.empty()) {
     render_frame_host->AllowBindings(content::BINDINGS_POLICY_HEADLESS);
   }
 
@@ skipping 128 matching lines @@
 HeadlessWebContents::Builder::MojoService::MojoService() {}
 
 HeadlessWebContents::Builder::MojoService::MojoService(
     const std::string& service_name,
     const base::Callback<void(mojo::ScopedMessagePipeHandle)>& service_factory)
     : service_name(service_name), service_factory(service_factory) {}
 
 HeadlessWebContents::Builder::MojoService::~MojoService() {}
 
 }  // namespace headless