Disallow redirects in SDCH dictionary fetches.

net/url_request/sdch_dictionary_fetcher.h

 // Copyright 2014 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.
 
 // TODO(rdsmith): This class needs to delegate URLRequest::Delegate methods
 // to the net/ embedder for correct implementation of authentication.
 // Specifically, this class needs the embedder to provide functionality
 // corresponding to
 // URLRequest::Delegate::{OnAuthRequired,OnCertificateRequested}.
 
@@ skipping 44 matching lines @@
   // Request a dictionary fetch from cache only.  The callback will be called
   // only if the dictionary is successfully fetched. Returns true if a request
   // for |dictionary_url| has been scheduled, and false otherwise.
   virtual bool ScheduleReload(const GURL& dictionary_url,
                               const OnDictionaryFetchedCallback& callback);
 
   // Cancel any in-progress requests.
   virtual void Cancel();
 
   // Implementation of URLRequest::Delegate methods.
+  void OnReceivedRedirect(URLRequest* request,
+                          const RedirectInfo& redirect_info,
+                          bool* defer_redirect) override;
   void OnResponseStarted(URLRequest* request) override;
   void OnReadCompleted(URLRequest* request, int bytes_read) override;
 
  private:
   enum State {
     STATE_NONE,
     STATE_SEND_REQUEST,
-    STATE_SEND_REQUEST_COMPLETE,
+    STATE_RECEIVED_REDIRECT,
+    STATE_SEND_REQUEST_PENDING,
     STATE_READ_BODY,
     STATE_READ_BODY_COMPLETE,
     STATE_REQUEST_COMPLETE,
   };
 
   class UniqueFetchQueue;
 
   // Schedule implementation. Returns true if a request for |dictionary_url| has
   // been added to the queue, and false otherwise.
   bool ScheduleInternal(const GURL& dictionary_url,
                         bool reload,
                         const OnDictionaryFetchedCallback& callback);
 
   // Null out the current request and push the state machine to the
   // next request, if any.
   void ResetRequest();
 
   // State machine implementation.
   int DoLoop(int rv);
   int DoSendRequest(int rv);
-  int DoSendRequestComplete(int rv);
+  int DoReceivedRedirect(int rv);
+  int DoSendRequestPending(int rv);
   int DoReadBody(int rv);
   int DoReadBodyComplete(int rv);
   int DoCompleteRequest(int rv);
 
   State next_state_;
   bool in_loop_;
 
   // A queue of URLs that are being used to download dictionaries.
   scoped_ptr<UniqueFetchQueue> fetch_queue_;
 
   // The request, buffer, and consumer supplied data used for getting
   // the current dictionary.  All are null when a fetch is not in progress.
   scoped_ptr<URLRequest> current_request_;
   scoped_refptr<IOBuffer> buffer_;
   OnDictionaryFetchedCallback current_callback_;
 
   // The currently accumulating dictionary.
   std::string dictionary_;
 
+  // In the case of a redirect, the URL to which the request is being
+  // redirected.
+  GURL redirect_url_;
+
   // Store the URLRequestContext associated with the owning SdchManager for
   // use while fetching.
   URLRequestContext* const context_;
 
   DISALLOW_COPY_AND_ASSIGN(SdchDictionaryFetcher);
 };
 
 }  // namespace net
 
 #endif  // NET_URL_REQUEST_SDCH_DICTIONARY_FETCHER_H_