Fix incorrect DCHECK in task manager's WebContentsEntry.

chrome/browser/task_manager/providers/web_contents/web_contents_task_provider.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 "chrome/browser/task_manager/providers/web_contents/web_contents_task_provider.h"
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "chrome/browser/task_manager/providers/web_contents/subframe_task.h"
 #include "chrome/browser/task_manager/providers/web_contents/web_contents_tags_manager.h"
+#include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 
 using content::RenderFrameHost;
 using content::RenderWidgetHost;
 using content::SiteInstance;
 using content::WebContents;
@@ skipping 133 matching lines @@
   ClearAllTasks(true);
   provider_->DeleteEntry(web_contents());
 }
 
 void WebContentsEntry::RenderProcessGone(base::TerminationStatus status) {
   ClearAllTasks(true);
 }
 
 void WebContentsEntry::OnRendererUnresponsive(
     RenderWidgetHost* render_widget_host) {
-  RendererTask* task = GetTaskForFrame(web_contents()->GetMainFrame());
+  // Find the first RenderFrameHost matching the RenderWidgetHost.
+  RendererTask* task = nullptr;
+  for (const auto& pair : tasks_by_frames_) {
+    if (pair.first->GetView() == render_widget_host->GetView()) {
+      DCHECK_EQ(pair.first->GetProcess(), render_widget_host->GetProcess());
+      task = pair.second;
+      break;
+    }
+  }
   if (!task)
     return;
 
-  DCHECK_EQ(render_widget_host->GetProcess(),
-            web_contents()->GetMainFrame()->GetProcess());
-
   provider_->NotifyObserverTaskUnresponsive(task);
 }
 
 void WebContentsEntry::DidFinishNavigation(
     content::NavigationHandle* navigation_handle) {
+  // We only need to update tasks for main frame navigations.
+  if (!navigation_handle->IsInMainFrame())
+    return;
+
   RendererTask* main_frame_task =
       GetTaskForFrame(web_contents()->GetMainFrame());
   if (!main_frame_task)
     return;
 
   main_frame_task->UpdateRapporSampleName();
 
   ForEachTask(base::Bind([](RendererTask* task) {
     // Listening to WebContentsObserver::TitleWasSet() only is not enough in
     // some cases when the the web page doesn't have a title. That's why we
@@ skipping 203 matching lines @@
 }
 
 void WebContentsTaskProvider::DeleteEntry(content::WebContents* web_contents) {
   // This erase() will delete the WebContentsEntry, which is actually our
   // caller, but it's expecting us to delete it.
   bool success = entries_map_.erase(web_contents) != 0;
   DCHECK(success);
 }
 
 }  // namespace task_manager