Handle additional feedback from http://codereview.chromium.org/8395038/.

content/test/test_url_fetcher_factory.h

 // Copyright (c) 2011 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.
 
 #ifndef CONTENT_TEST_TEST_URL_FETCHER_FACTORY_H_
 #define CONTENT_TEST_TEST_URL_FETCHER_FACTORY_H_
 #pragma once
 
 #include <list>
 #include <map>
@@ skipping 11 matching lines @@
 class ScopedURLFetcherFactory : public base::NonThreadSafe {
  public:
   explicit ScopedURLFetcherFactory(content::URLFetcherFactory* factory);
   virtual ~ScopedURLFetcherFactory();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScopedURLFetcherFactory);
 };
 
 // TestURLFetcher and TestURLFetcherFactory are used for testing consumers of
-// URLFetcher. TestURLFetcherFactory is a URLFetcher::Factory that creates
+// URLFetcher. TestURLFetcherFactory is a URLFetcherFactory that creates
 // TestURLFetchers. TestURLFetcher::Start is overriden to do nothing. It is
 // expected that you'll grab the delegate from the TestURLFetcher and invoke
 // the callback method when appropriate. In this way it's easy to mock a
 // URLFetcher.
 // Typical usage:
 //   // TestURLFetcher requires a MessageLoop:
 //   MessageLoopForUI message_loop;
 //   // And io_thread to release URLRequestContextGetter in URLFetcher::Core.
 //   BrowserThread io_thread(BrowserThread::IO, &message_loop);
 //   // Create factory (it automatically sets itself as URLFetcher's factory).
 //   TestURLFetcherFactory factory;
 //   // Do something that triggers creation of a URLFetcher.
 //   TestURLFetcher* fetcher = factory.GetFetcherByID(expected_id);
 //   DCHECK(fetcher);
 //   // Notify delegate with whatever data you want.
 //   fetcher->delegate()->OnURLFetchComplete(...);
 //   // Make sure consumer of URLFetcher does the right thing.
 //   ...
 //
 // Note: if you don't know when your request objects will be created you
 // might want to use the FakeUrlFetcher and FakeUrlFetcherFactory classes

[wtc, 2011/10/27 23:56:50]

Fix these two typos: FakeUrlFetcher and FakeUrlFetcherFactory

 // below.
 
 class TestURLFetcher : public content::URLFetcher {
  public:
   TestURLFetcher(int id,
                  const GURL& url,
-                 RequestType request_type,
                  content::URLFetcherDelegate* d);
   virtual ~TestURLFetcher();
 
   // content::URLFetcher implementation
   virtual void SetUploadData(const std::string& upload_content_type,
                              const std::string& upload_content) OVERRIDE;
   virtual void SetChunkedUpload(
       const std::string& upload_content_type) OVERRIDE;
   // Overriden to cache the chunks uploaded. Caller can read back the uploaded
   // chunks with the upload_chunks() accessor.
@@ skipping 14 matching lines @@
   virtual base::TimeDelta GetBackoffDelay() const OVERRIDE;
   virtual void SaveResponseToTemporaryFile(
       scoped_refptr<base::MessageLoopProxy> file_message_loop_proxy) OVERRIDE;
   virtual net::HttpResponseHeaders* GetResponseHeaders() const OVERRIDE;
   virtual net::HostPortPair GetSocketAddress() const OVERRIDE;
   virtual bool WasFetchedViaProxy() const OVERRIDE;
   virtual void Start() OVERRIDE;
   virtual void StartWithRequestContextGetter(
       net::URLRequestContextGetter* request_context_getter) OVERRIDE;
 
-  // URL we were created with. Because of how we're using URLFetcher GetUrl()
+  // URL we were created with. Because of how we're using URLFetcher GetURL()
   // always returns an empty URL. Chances are you'll want to use
-  // GetOriginalUrl() in your tests.
-  virtual const GURL& GetOriginalUrl() const OVERRIDE;
-  virtual const GURL& GetUrl() const OVERRIDE;
+  // GetOriginalURL() in your tests.
+  virtual const GURL& GetOriginalURL() const OVERRIDE;
+  virtual const GURL& GetURL() const OVERRIDE;
   virtual const net::URLRequestStatus& GetStatus() const OVERRIDE;
   virtual int GetResponseCode() const OVERRIDE;
   virtual const net::ResponseCookies& GetCookies() const OVERRIDE;
   virtual bool FileErrorOccurred(
       base::PlatformFileError* out_error_code) const OVERRIDE;
   virtual void ReceivedContentWasMalformed() OVERRIDE;
   // Override response access functions to return fake data.
   virtual bool GetResponseAsString(
       std::string* out_response_string) const OVERRIDE;
   virtual bool GetResponseAsFilePath(
@@ skipping 54 matching lines @@
   FilePath fake_response_file_path_;
   bool fake_was_fetched_via_proxy_;
   scoped_refptr<net::HttpResponseHeaders> fake_response_headers_;
   net::HttpRequestHeaders fake_extra_request_headers_;
   int fake_max_retries_;
   base::TimeDelta fake_backoff_delay_;
 
   DISALLOW_COPY_AND_ASSIGN(TestURLFetcher);
 };
 
-// Simple URLFetcher::Factory method that creates TestURLFetchers. All fetchers
+// Simple URLFetcherFactory method that creates TestURLFetchers. All fetchers
 // are registered in a map by the id passed to the create method.
 class TestURLFetcherFactory : public content::URLFetcherFactory,
                               public ScopedURLFetcherFactory {
  public:
   TestURLFetcherFactory();
   virtual ~TestURLFetcherFactory();
 
   virtual content::URLFetcher* CreateURLFetcher(
       int id,
       const GURL& url,
       content::URLFetcher::RequestType request_type,
       content::URLFetcherDelegate* d) OVERRIDE;
   TestURLFetcher* GetFetcherByID(int id) const;
   void RemoveFetcherFromMap(int id);
 
  private:
   // Maps from id passed to create to the returned URLFetcher.
   typedef std::map<int, TestURLFetcher*> Fetchers;
   Fetchers fetchers_;
 
   DISALLOW_COPY_AND_ASSIGN(TestURLFetcherFactory);
 };
 
-// The FakeUrlFetcher and FakeUrlFetcherFactory classes are similar to the
+// The FakeURLFetcher and FakeURLFetcherFactory classes are similar to the
 // ones above but don't require you to know when exactly the URLFetcher objects
 // will be created.
 //
 // These classes let you set pre-baked HTTP responses for particular URLs.
 // E.g., if the user requests http://a.com/ then respond with an HTTP/500.
 //
 // We assume that the thread that is calling Start() on the URLFetcher object
 // has a message loop running.
 //
 // This class is not thread-safe.  You should not call SetFakeResponse or
@@ skipping 49 matching lines @@
   void ClearFakeResponses();
 
  private:
   typedef std::map<GURL, std::pair<std::string, bool> > FakeResponseMap;
   FakeResponseMap fake_responses_;
   content::URLFetcherFactory* default_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeURLFetcherFactory);
 };
 
-// This is an implementation of URLFetcher::Factory that will create a real
-// URLFetcher. It can be use in conjunction with a FakeURLFetcherFactory in
+// This is an implementation of URLFetcherFactory that will create a
+// URLFetcherImpl. It can be use in conjunction with a FakeURLFetcherFactory in
 // integration tests to control the behavior of some requests but execute
 // all the other ones.
-class URLFetcherFactory : public content::URLFetcherFactory {
+class URLFetcherImplFactory : public content::URLFetcherFactory {
  public:
-  URLFetcherFactory();
-  virtual ~URLFetcherFactory();
+  URLFetcherImplFactory();
+  virtual ~URLFetcherImplFactory();
 
   // This method will create a real URLFetcher.
   virtual content::URLFetcher* CreateURLFetcher(
       int id,
       const GURL& url,
       content::URLFetcher::RequestType request_type,
       content::URLFetcherDelegate* d) OVERRIDE;
 
 };
 
 #endif  // CONTENT_TEST_TEST_URL_FETCHER_FACTORY_H_