Merge r21417 to 172....

chrome/browser/chrome_plugin_host.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.
 
 #include "chrome/browser/chrome_plugin_host.h"
 
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 174 matching lines @@
       return true;
     }
 
     if (!request_->status().is_io_pending())
       my_buffer_ = NULL;
 
     return false;
   }
 
   // URLRequest::Delegate
-  virtual void OnReceivedRedirect(URLRequest* request, const GURL& new_url) {
+  virtual void OnReceivedRedirect(URLRequest* request, const GURL& new_url,
+                                  bool* defer_redirect) {
     plugin_->functions().response_funcs->received_redirect(
         cprequest_.get(), new_url.spec().c_str());
   }
 
   virtual void OnResponseStarted(URLRequest* request) {
     // TODO(mpcomplete): better error codes
     CPError result =
         request_->status().is_success() ? CPERR_SUCCESS : CPERR_FAILURE;
     plugin_->functions().response_funcs->start_completed(
         cprequest_.get(), result);
@@ skipping 591 matching lines @@
 void CPHandleCommand(int command, CPCommandInterface* data,
                      CPBrowsingContext context) {
   // Sadly if we try and pass context through, we seem to break cl's little
   // brain trying to compile the Tuple3 ctor. This cast works.
   int32 context_as_int32 = static_cast<int32>(context);
   // Plugins can only be accessed on the IO thread.
   g_browser_process->io_thread()->message_loop()->PostTask(FROM_HERE,
       NewRunnableFunction(PluginCommandHandler::HandleCommand,
                           command, data, context_as_int32));
 }