Fix a layout test crash caused by simple_resource_loader_bridge.cc

webkit/tools/test_shell/simple_resource_loader_bridge.cc

 // Copyright (c) 2006-2008 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.
 //
 // This file contains an implementation of the ResourceLoaderBridge class.
 // The class is implemented using URLRequest, meaning it is a "simple" version
 // that directly issues requests. The more complicated one used in the
 // browser uses IPC.
 //
 // Because URLRequest only provides an asynchronous resource loading API, this
@@ skipping 302 matching lines @@
       MaybeUpdateUploadProgress();
       upload_progress_timer_.Stop();
     }
     DCHECK(request_.get());
     OnCompletedRequest(request_->status(), std::string());
     request_.reset();  // destroy on the io thread
   }
 
   // Called on the IO thread.
   void MaybeUpdateUploadProgress() {
+    // If a redirect is received upload is cancelled in URLRequest, we should
+    // try to stop the |upload_progress_timer_| timer and return.
+    if (!request_->has_upload()) {
+      if (upload_progress_timer_.IsRunning())
+        upload_progress_timer_.Stop();
+      return;
+    }
+
     uint64 size = request_->get_upload()->GetContentLength();
     uint64 position = request_->GetUploadProgress();
     if (position == last_upload_position_)
       return;  // no progress made since last time
 
     const uint64 kHalfPercentIncrements = 200;
     const base::TimeDelta kOneSecond = base::TimeDelta::FromMilliseconds(1000);
 
     uint64 amt_since_last = position - last_upload_position_;
     base::TimeDelta time_since_last = base::TimeTicks::Now() -
@@ skipping 295 matching lines @@
     return std::string();
   }
 
   scoped_refptr<CookieGetter> getter = new CookieGetter();
 
   io_thread->message_loop()->PostTask(FROM_HERE, NewRunnableMethod(
       getter.get(), &CookieGetter::Get, url));
 
   return getter->GetResult();
 }