Fix front-end host creation upon navigation

chrome/browser/devtools/devtools_ui_bindings.cc

 // Copyright 2014 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/devtools/devtools_ui_bindings.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
@@ skipping 453 matching lines @@
 DevToolsUIBindings::FrontendWebContentsObserver::
     ~FrontendWebContentsObserver() {
 }
 
 // static
 GURL DevToolsUIBindings::SanitizeFrontendURL(const GURL& url) {
   return ::SanitizeFrontendURL(url, content::kChromeDevToolsScheme,
       chrome::kChromeUIDevToolsHost, SanitizeFrontendPath(url.path()), true);
 }
 
+bool DevToolsUIBindings::IsValidFrontendURL(const GURL& url) {
+  return SanitizeFrontendURL(url).spec() == url.spec();
+}
+
 void DevToolsUIBindings::FrontendWebContentsObserver::RenderProcessGone(
     base::TerminationStatus status) {
   bool crashed = true;
   switch (status) {
     case base::TERMINATION_STATUS_ABNORMAL_TERMINATION:
     case base::TERMINATION_STATUS_PROCESS_WAS_KILLED:
 #if defined(OS_CHROMEOS)
     case base::TERMINATION_STATUS_PROCESS_WAS_KILLED_BY_OOM:
 #endif
     case base::TERMINATION_STATUS_PROCESS_CRASHED:
     case base::TERMINATION_STATUS_LAUNCH_FAILED:
       if (devtools_bindings_->agent_host_.get())
         devtools_bindings_->Detach();
       break;
     default:
       crashed = false;
       break;
   }
   devtools_bindings_->delegate_->RenderProcessGone(crashed);
 }
 
 void DevToolsUIBindings::FrontendWebContentsObserver::
     DidStartNavigationToPendingEntry(const GURL& url,
                                      content::ReloadType reload_type) {
-  devtools_bindings_->UpdateFrontendHost();
+  devtools_bindings_->UpdateFrontendHost(url);
 }
 
 void DevToolsUIBindings::FrontendWebContentsObserver::
     DocumentAvailableInMainFrame() {
   devtools_bindings_->DocumentAvailableInMainFrame();
 }
 
 void DevToolsUIBindings::FrontendWebContentsObserver::
     DocumentOnLoadCompletedInMainFrame() {
   devtools_bindings_->DocumentOnLoadCompletedInMainFrame();
@@ skipping 34 matching lines @@
   web_contents_->GetMutableRendererPrefs()->can_accept_load_drops = false;
 
   file_helper_.reset(new DevToolsFileHelper(web_contents_, profile_, this));
   file_system_indexer_ = new DevToolsFileSystemIndexer();
   extensions::ChromeExtensionWebContentsObserver::CreateForWebContents(
       web_contents_);
 
   // Register on-load actions.
   embedder_message_dispatcher_.reset(
       DevToolsEmbedderMessageDispatcher::CreateForDevToolsFrontend(this));
-  UpdateFrontendHost();
+  UpdateFrontendHost(web_contents_->GetVisibleURL());

[pfeldman, 2017/01/10 22:31:51]

I don't think you need this call - navigation should follow.

 }
 
 DevToolsUIBindings::~DevToolsUIBindings() {
   for (const auto& pair : pending_requests_)
     delete pair.first;
 
   if (agent_host_.get())
     agent_host_->DetachClient(this);
 
   for (IndexingJobsMap::const_iterator jobs_it(indexing_jobs_.begin());
@@ skipping 627 matching lines @@
     const InfoBarCallback& callback) {
   if (!delegate_->GetInfoBarService()) {
     callback.Run(false);
     return;
   }
   std::unique_ptr<DevToolsConfirmInfoBarDelegate> delegate(
       new DevToolsConfirmInfoBarDelegate(callback, message));
   GlobalConfirmInfoBar::Show(std::move(delegate));
 }
 
-void DevToolsUIBindings::UpdateFrontendHost() {
-  GURL url = web_contents_->GetVisibleURL();
-  if (url.spec() != SanitizeFrontendURL(url).spec()) {
+void DevToolsUIBindings::UpdateFrontendHost(const GURL& url) {
+  if (!IsValidFrontendURL(url)) {
     LOG(ERROR) << "Attempt to navigate to an invalid DevTools front-end URL: "
         << url.spec();
     frontend_host_.reset();
     return;
   }
   frontend_host_.reset(content::DevToolsFrontendHost::Create(
-      web_contents_->GetMainFrame(),
+      web_contents_,
       base::Bind(&DevToolsUIBindings::HandleMessageFromDevToolsFrontend,
                  base::Unretained(this))));
 }
 
 void DevToolsUIBindings::AddDevToolsExtensionsToClient() {
   const extensions::ExtensionRegistry* registry =
       extensions::ExtensionRegistry::Get(profile_->GetOriginalProfile());
   if (!registry)
     return;
 
@@ skipping 112 matching lines @@
 void DevToolsUIBindings::FrontendLoaded() {
   if (frontend_loaded_)
     return;
   frontend_loaded_ = true;
 
   // Call delegate first - it seeds importants bit of information.
   delegate_->OnLoadCompleted();
 
   AddDevToolsExtensionsToClient();
 }