Merge r21417 to 172....

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 258 matching lines @@
   virtual void OnCompletedRequest(const URLRequestStatus& status,
                                   const std::string& security_info) {
     owner_loop_->PostTask(FROM_HERE, NewRunnableMethod(
         this, &RequestProxy::NotifyCompletedRequest, status, security_info));
   }
 
   // --------------------------------------------------------------------------
   // URLRequest::Delegate implementation:
 
   virtual void OnReceivedRedirect(URLRequest* request,
-                                  const GURL& new_url) {
+                                  const GURL& new_url,
+                                  bool* defer_redirect) {
     DCHECK(request->status().is_success());
     OnReceivedRedirect(new_url);
   }
 
   virtual void OnResponseStarted(URLRequest* request) {
     if (request->status().is_success()) {
       ResourceLoaderBridge::ResponseInfo info;
       info.request_time = request->request_time();
       info.response_time = request->response_time();
       info.headers = request->response_headers();
@@ skipping 354 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();
 }