DevTools: create test infrastructure so devtools drives the test

content/shell/browser/shell_devtools_bindings.cc

 // Copyright 2017 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 "content/shell/browser/shell_devtools_bindings.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 119 matching lines @@
   for (const auto& pair : pending_requests_)
     delete pair.first;
   if (agent_host_)
     agent_host_->DetachClient(this);
 }
 
 void ShellDevToolsBindings::ReadyToCommitNavigation(
     NavigationHandle* navigation_handle) {
 #if !defined(OS_ANDROID)
   content::RenderFrameHost* frame = navigation_handle->GetRenderFrameHost();
+  if (navigation_handle->IsInMainFrame()) {
+    CreateFrontendHost(frame);
+  }
   if (!frame->GetParent())

[dgozman, 2017/06/15 21:16:48]

This is the same check as previous if - combine them.

[chenwilliam, 2017/06/19 18:33:29]

Done.

     return;
   std::string origin = navigation_handle->GetURL().GetOrigin().spec();
   auto it = extensions_api_.find(origin);
   if (it == extensions_api_.end())
     return;
   std::string script = base::StringPrintf("%s(\"%s\")", it->second.c_str(),
                                           base::GenerateGUID().c_str());
   DevToolsFrontendHost::SetupExtensionsAPI(frame, script);
 #endif
 }
 
-void ShellDevToolsBindings::RenderViewCreated(
-    RenderViewHost* render_view_host) {
-  CreateFrontendHost();
-}
-
 #if !defined(OS_ANDROID)
-void ShellDevToolsBindings::CreateFrontendHost() {
-  if (!frontend_host_) {
-    frontend_host_.reset(DevToolsFrontendHost::Create(
-        web_contents()->GetMainFrame(),
-        base::Bind(&ShellDevToolsBindings::HandleMessageFromDevToolsFrontend,
-                   base::Unretained(this))));
-  }
+void ShellDevToolsBindings::CreateFrontendHost(

[dgozman, 2017/06/15 21:16:48]

Inline it to the method above.

[chenwilliam, 2017/06/19 18:33:29]

Done.

+    RenderFrameHost* render_frame_host) {
+  frontend_host_.reset(DevToolsFrontendHost::Create(
+      render_frame_host,
+      base::Bind(&ShellDevToolsBindings::HandleMessageFromDevToolsFrontend,
+                 base::Unretained(this))));
 }
 #endif
 
 #if defined(OS_ANDROID)
 void ShellDevToolsBindings::CreateFrontendHost() {}
 #endif
 
 void ShellDevToolsBindings::DocumentAvailableInMainFrame() {
   agent_host_ = DevToolsAgentHost::GetOrCreateFor(inspected_contents_);
   agent_host_->AttachClient(this);
@@ skipping 221 matching lines @@
 }
 
 void ShellDevToolsBindings::AgentHostClosed(DevToolsAgentHost* agent_host,
                                             bool replaced) {
   agent_host_ = nullptr;
   if (delegate_)
     delegate_->Close();
 }
 
 }  // namespace content