Merge r21417 to 172....

chrome/browser/plugin_process_host.cc

Index: chrome/browser/plugin_process_host.cc
===================================================================
--- chrome/browser/plugin_process_host.cc	(revision 23600)
+++ chrome/browser/plugin_process_host.cc	(working copy)
@@ -68,8 +68,6 @@
   void InitiateDownload();
 
   // URLRequest::Delegate
-  virtual void OnReceivedRedirect(URLRequest* request,
-                                  const GURL& new_url);
   virtual void OnAuthRequired(URLRequest* request,
                               net::AuthChallengeInfo* auth_info);
   virtual void OnSSLCertificateError(URLRequest* request,
@@ -129,10 +127,6 @@
   download_file_request_->Start();
 }
 
-void PluginDownloadUrlHelper::OnReceivedRedirect(URLRequest* request,
-                                                 const GURL& new_url) {
-}
-
 void PluginDownloadUrlHelper::OnAuthRequired(
     URLRequest* request,
     net::AuthChallengeInfo* auth_info) {
Property changes on: chrome\browser\plugin_process_host.cc
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/chrome/browser/plugin_process_host.cc:r14162,14665,15308,15810,15899,15950,16015,16808,18093,18210,18321,18640,18871,19044,19692,19978,19995,21417,22284