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 19 matching lines @@
 // This class is used by embedder SDCH policy object to fetch
 // dictionaries. It queues requests for dictionaries and dispatches
 // them serially, implementing the URLRequest::Delegate interface to
 // handle callbacks (but see above TODO). It tracks all requests, only
 // attempting to fetch each dictionary once.
 class NET_EXPORT SdchDictionaryFetcher : public URLRequest::Delegate,
                                          public base::NonThreadSafe {
  public:
   typedef base::Callback<void(const std::string& dictionary_text,
                               const GURL& dictionary_url,
                               const BoundNetLog& net_log)>

[mmenke, 2015/01/30 16:20:44]

While you're here, should include net/base/net_log.h, ref_counted.h, and
macros.h.

Should also forward declare GURL, 

[Randy Smith (Not in Mondays), 2015/01/30 19:21:58]

ref_counted.h & macros.h: Done.  I couldn't figure out why I should include
net_log.h here instead of forward declaring BoundNetLog and including net_log.h
in the .cc file, so I did that instead (which may have been what you meant).
Actually, I think I need to include the header file for GURL, since I've got
std::queue<GURL> and std::set<GURL> below.

[mmenke, 2015/01/30 19:27:52]

You're right.  Almost everything in net/ keeps a BoundNetLog a class variable,
so just assumed it was the case here as well
Works for me, but I don't think it's needed - the compiler doesn't need to know
the size of the GURL to interpret that, which is the same reason you can forward
declare stuff you store in a scoped_ptr<Foo>.

       OnDictionaryFetchedCallback;
 
   // The consumer must guarantee that |*context| outlives this object.
   // |callback| will be called on successful dictionary fetch
   // requested through Schedule().  |callback| will not be called
   // after object destruction.
   SdchDictionaryFetcher(URLRequestContext* context,
                         const OnDictionaryFetchedCallback& callback);
   ~SdchDictionaryFetcher() override;
 
   // Request a new dictionary fetch.
   void Schedule(const GURL& dictionary_url);
 
   // 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,
   };
 
   // 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_