Revert r23616 from 172.

net/url_request/url_request_unittest.h

Index: net/url_request/url_request_unittest.h
===================================================================
--- net/url_request/url_request_unittest.h	(revision 23699)
+++ net/url_request/url_request_unittest.h	(working copy)
@@ -69,7 +69,6 @@
         cancel_in_rd_(false),
         cancel_in_rd_pending_(false),
         quit_on_complete_(true),
-        quit_on_redirect_(false),
         allow_certificate_errors_(false),
         response_started_count_(0),
         received_bytes_count_(0),
@@ -80,15 +79,10 @@
         buf_(new net::IOBuffer(kBufferSize)) {
   }
 
-  virtual void OnReceivedRedirect(URLRequest* request, const GURL& new_url,
-                                  bool* defer_redirect) {
+  virtual void OnReceivedRedirect(URLRequest* request, const GURL& new_url) {
     received_redirect_count_++;
-    if (quit_on_redirect_) {
-      *defer_redirect = true;
-      MessageLoop::current()->Quit();
-    } else if (cancel_in_rr_) {
+    if (cancel_in_rr_)
       request->Cancel();
-    }
   }
 
   virtual void OnResponseStarted(URLRequest* request) {
@@ -183,7 +177,6 @@
     cancel_in_rd_pending_ = val;
   }
   void set_quit_on_complete(bool val) { quit_on_complete_ = val; }
-  void set_quit_on_redirect(bool val) { quit_on_redirect_ = val; }
   void set_allow_certificate_errors(bool val) {
     allow_certificate_errors_ = val;
   }
@@ -209,7 +202,6 @@
   bool cancel_in_rd_;
   bool cancel_in_rd_pending_;
   bool quit_on_complete_;
-  bool quit_on_redirect_;
   bool allow_certificate_errors_;
 
   std::wstring username_;
Property changes on: net\url_request\url_request_unittest.h
___________________________________________________________________
Modified: svn:mergeinfo
   Reverse-merged /trunk/src/net/url_request/url_request_unittest.h:r14162,15308,16015,16808,19173,21417
   Merged /trunk/src/net/url_request/url_request_unittest.h:r22067