Another attempt at fixing dead frames being tracked by webNavigation

chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.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 "chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h"
 
 #include <string>
 
 #include "base/base64.h"
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/download/download_request_limiter.h"
 #include "chrome/browser/download/download_resource_throttle.h"
 #include "chrome/browser/download/download_util.h"
 #include "chrome/browser/extensions/user_script_listener.h"
 #include "chrome/browser/external_protocol/external_protocol_handler.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/instant/instant_loader.h"
 #include "chrome/browser/net/load_timing_observer.h"
 #include "chrome/browser/net/resource_prefetch_predictor_observer.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_tracker.h"
 #include "chrome/browser/profiles/profile_io_data.h"
 #include "chrome/browser/renderer_host/chrome_url_request_user_data.h"
 #include "chrome/browser/renderer_host/safe_browsing_resource_throttle.h"
+#include "chrome/browser/renderer_host/test_navigation_listener.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/ui/auto_login_prompter.h"
 #include "chrome/browser/ui/login/login_prompt.h"
 #include "chrome/browser/ui/sync/one_click_signin_helper.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/user_script.h"
 #include "chrome/common/metrics/experiments_helper.h"
 #include "chrome/common/metrics/proto/chrome_experiments.pb.h"
 #include "chrome/common/render_messages.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 38 matching lines @@
     : download_request_limiter_(g_browser_process->download_request_limiter()),
       safe_browsing_(g_browser_process->safe_browsing_service()),
       user_script_listener_(new extensions::UserScriptListener()),
       prerender_tracker_(prerender_tracker),
       variation_ids_cache_initialized_(false) {
 }
 
 ChromeResourceDispatcherHostDelegate::~ChromeResourceDispatcherHostDelegate() {
 }
 
+void ChromeResourceDispatcherHostDelegate::SetTestNavigationListener(
+    TestNavigationListener* test_navigation_listener) {
+  test_navigation_listener_ = test_navigation_listener;
+}
+
 bool ChromeResourceDispatcherHostDelegate::ShouldBeginRequest(
     int child_id,
     int route_id,
     const std::string& method,
     const GURL& url,
     ResourceType::Type resource_type,
     content::ResourceContext* resource_context,
     const content::Referrer& referrer) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
@@ skipping 177 matching lines @@
     throttles->push_back(SafeBrowsingResourceThrottle::Create(
         request, child_id, route_id, is_subresource_request, safe_browsing_));
   }
 #endif
 
   content::ResourceThrottle* throttle =
       user_script_listener_->CreateResourceThrottle(request->url(),
                                                     resource_type);
   if (throttle)
     throttles->push_back(throttle);
+
+  if (test_navigation_listener_.get()) {
+    throttle = test_navigation_listener_->CreateResourceThrottle(request->url(),
+                                                                 resource_type);
+    if (throttle)
+      throttles->push_back(throttle);
+  }
 }
 
 void ChromeResourceDispatcherHostDelegate::AppendChromeMetricsHeaders(
     net::URLRequest* request,
     content::ResourceContext* resource_context,
     ResourceType::Type resource_type) {
   // Don't attempt to append headers to requests that have already started.
   // TODO(stevet): Remove this once we've resolved the request ordering issues
   // in crbug.com/128048.
   if (request->is_pending())
@@ skipping 144 matching lines @@
   if (base::Base64Encode(serialized, &hashed)) {
     // If successful, swap the header value with the new one.
     // Note that the list of IDs and the header could be temporarily out of sync
     // if IDs are added as we are recreating the header, but we're OK with those
     // descrepancies.
     variation_ids_header_ = hashed;
   } else {
     DVLOG(1) << "Failed to base64 encode Variation IDs value: " << serialized;
   }
 }