Naming and refactoring changes to SdchDictionaryFetcher.

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 43 matching lines @@
   // Cancel any in-progress requests.
   void Cancel();
 
   // Implementation of URLRequest::Delegate methods.
   void OnResponseStarted(URLRequest* request) override;
   void OnReadCompleted(URLRequest* request, int bytes_read) override;
 
  private:
   enum State {
     STATE_NONE,
-    STATE_IDLE,
-    STATE_REQUEST_STARTED,
-    STATE_REQUEST_READING,
+    STATE_SEND_REQUEST,
+    STATE_SEND_REQUEST_COMPLETE,
+    STATE_READ_BODY,
+    STATE_READ_BODY_COMPLETE,
     STATE_REQUEST_COMPLETE,
   };
 
+  // Map the number of bytes read and the error code into a single
+  // status value, either positive (bytes read), 0 (end of file), or
+  // negative (error code).
+  int GetReadResult(int bytes_read);
+
   // State machine implementation.
   int DoLoop(int rv);
-  int DoDispatchRequest(int rv);
-  int DoRequestStarted(int rv);
-  int DoRead(int rv);
+  int DoSendRequest(int rv);
+  int DoSendRequestComplete(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.
   std::queue<GURL> fetch_queue_;
 
   // The request and buffer used for getting the current dictionary
   // Both are null when a fetch is not in progress.
@@ skipping 25 matching lines @@
   const OnDictionaryFetchedCallback dictionary_fetched_callback_;
 
   base::WeakPtrFactory<SdchDictionaryFetcher> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SdchDictionaryFetcher);
 };
 
 }  // namespace net
 
 #endif  // NET_URL_REQUEST_SDCH_DICTIONARY_FETCHER_H_