Fix HTML5 video streaming.

content/browser/renderer_host/async_resource_handler.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/renderer_host/async_resource_handler.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/debug/alias.h"
@@ skipping 79 matching lines @@
     : filter_(filter),
       routing_id_(routing_id),
       request_(request),
       rdh_(rdh),
       next_buffer_size_(kInitialReadBufSize),
       pending_data_count_(0),
       did_defer_(false) {
 }
 
 AsyncResourceHandler::~AsyncResourceHandler() {
+  // Cleanup back-pointer stored on the request info.
+  ResourceRequestInfoImpl::ForRequest(request_)->set_async_handler(NULL);
 }
 
 void AsyncResourceHandler::OnFollowRedirect(
     bool has_new_first_party_for_cookies,
     const GURL& new_first_party_for_cookies) {
   if (!request_->status().is_success()) {
     DVLOG(1) << "OnFollowRedirect for invalid request";
     return;
   }
 
@@ skipping 217 matching lines @@
 
 void AsyncResourceHandler::MarkAsDeferred(bool deferred) {
   did_defer_ = deferred;
 
   // Set a back-pointer from ResourceRequestInfoImpl to |this| when deferred,
   // so that the ResourceDispatcherHostImpl can send us IPC messages.
   // TODO(darin): Implement an IPC message filter instead?
 
   ResourceRequestInfoImpl* info =
       ResourceRequestInfoImpl::ForRequest(request_);
-  if (deferred) {
+  if (deferred)
     info->set_async_handler(this);
-  } else {
-    info->set_async_handler(NULL);
-  }
 }
 
 void AsyncResourceHandler::ResumeIfDeferred() {
   if (did_defer_) {
     MarkAsDeferred(false);
     controller()->Resume();
   }
 }
 
 }  // namespace content