Better fix for a redundant call to Reattach in RenderViewDevToolsAgentHost::ConnectRenderViewHost

content/browser/devtools/render_view_devtools_agent_host.cc

 // Copyright (c) 2012 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/browser/devtools/render_view_devtools_agent_host.h"
 
 #include "base/basictypes.h"
 #include "base/lazy_instance.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/devtools/devtools_manager_impl.h"
@@ skipping 211 matching lines @@
 RenderViewDevToolsAgentHost::~RenderViewDevToolsAgentHost() {
   Instances::iterator it = std::find(g_instances.Get().begin(),
                                      g_instances.Get().end(),
                                      this);
   if (it != g_instances.Get().end())
     g_instances.Get().erase(it);
 }
 
 void RenderViewDevToolsAgentHost::AboutToNavigateRenderView(
     RenderViewHost* dest_rvh) {
-  if (!render_view_host_ || !IsAttached())
+  if (!render_view_host_)
     return;
 
   if (render_view_host_ == dest_rvh && static_cast<RenderViewHostImpl*>(
           render_view_host_)->render_view_termination_status() ==
               base::TERMINATION_STATUS_STILL_RUNNING)
     return;
   DisconnectRenderViewHost();
   ConnectRenderViewHost(dest_rvh);
 }
 
@@ skipping 23 matching lines @@
   ConnectRenderViewHost(web_contents->GetRenderViewHost());
 }
 
 void RenderViewDevToolsAgentHost::SetRenderViewHost(RenderViewHost* rvh) {
   render_view_host_ = rvh;
   rvh_observer_.reset(new DevToolsAgentHostRvhObserver(rvh, this));
 }
 
 void RenderViewDevToolsAgentHost::ConnectRenderViewHost(RenderViewHost* rvh) {
   SetRenderViewHost(rvh);
-  Reattach(state_);
+  if (IsAttached())
+    Reattach(state_);
 }
 
 void RenderViewDevToolsAgentHost::DisconnectRenderViewHost() {
   OnClientDetached();
   rvh_observer_.reset();
   render_view_host_ = NULL;
 }
 
 void RenderViewDevToolsAgentHost::RenderViewHostDestroyed(
     RenderViewHost* rvh) {
@@ skipping 47 matching lines @@
   if (render_view_host_)
     GetContentClient()->browser()->ClearCache(render_view_host_);
 }
 
 void RenderViewDevToolsAgentHost::OnClearBrowserCookies() {
   if (render_view_host_)
     GetContentClient()->browser()->ClearCookies(render_view_host_);
 }
 
 }  // namespace content