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

content/test/test_url_fetcher_factory.cc

 // 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.
 
 #include "content/test/test_url_fetcher_factory.h"
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "content/common/net/url_fetcher_impl.h"
 #include "content/public/common/url_fetcher_delegate.h"
 #include "net/base/host_port_pair.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request_status.h"
 
 ScopedURLFetcherFactory::ScopedURLFetcherFactory(
     content::URLFetcherFactory* factory) {
   DCHECK(!URLFetcherImpl::factory());
   URLFetcherImpl::set_factory(factory);
 }
 
 ScopedURLFetcherFactory::~ScopedURLFetcherFactory() {
   DCHECK(URLFetcherImpl::factory());
   URLFetcherImpl::set_factory(NULL);
 }
 
 TestURLFetcher::TestURLFetcher(int id,
                                const GURL& url,
-                               URLFetcher::RequestType request_type,
                                content::URLFetcherDelegate* d)
     : id_(id),
       original_url_(url),
       delegate_(d),
       did_receive_last_chunk_(false),
       fake_load_flags_(0),
       fake_response_code_(-1),
       fake_response_destination_(STRING),
       fake_was_fetched_via_proxy_(false),
       fake_max_retries_(0) {
@@ skipping 76 matching lines @@
 
 void TestURLFetcher::Start() {
   // Overriden to do nothing. It is assumed the caller will notify the delegate.
 }
 
 void TestURLFetcher::StartWithRequestContextGetter(
     net::URLRequestContextGetter* request_context_getter) {
   NOTIMPLEMENTED();
 }
 
-const GURL& TestURLFetcher::GetOriginalUrl() const {
+const GURL& TestURLFetcher::GetOriginalURL() const {
   return original_url_;
 }
 
-const GURL& TestURLFetcher::GetUrl() const {
+const GURL& TestURLFetcher::GetURL() const {
   return fake_url_;
 }
 
 const net::URLRequestStatus& TestURLFetcher::GetStatus() const {
   return fake_status_;
 }
 
 int TestURLFetcher::GetResponseCode() const {
   return fake_response_code_;
 }
@@ skipping 60 matching lines @@
     : ScopedURLFetcherFactory(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
 }
 
 TestURLFetcherFactory::~TestURLFetcherFactory() {}
 
 content::URLFetcher* TestURLFetcherFactory::CreateURLFetcher(
     int id,
     const GURL& url,
     content::URLFetcher::RequestType request_type,
     content::URLFetcherDelegate* d) {
-  TestURLFetcher* fetcher = new TestURLFetcher(id, url, request_type, d);
+  TestURLFetcher* fetcher = new TestURLFetcher(id, url, d);
   fetchers_[id] = fetcher;
   return fetcher;
 }
 
 TestURLFetcher* TestURLFetcherFactory::GetFetcherByID(int id) const {
   Fetchers::const_iterator i = fetchers_.find(id);
   return i == fetchers_.end() ? NULL : i->second;
 }
 
 void TestURLFetcherFactory::RemoveFetcherFromMap(int id) {
   Fetchers::iterator i = fetchers_.find(id);
   DCHECK(i != fetchers_.end());
   fetchers_.erase(i);
 }
 
 // This class is used by the FakeURLFetcherFactory below.
 class FakeURLFetcher : public TestURLFetcher {
  public:
   // Normal URL fetcher constructor but also takes in a pre-baked response.
-  FakeURLFetcher(const GURL& url, RequestType request_type,
+  FakeURLFetcher(const GURL& url,
                  content::URLFetcherDelegate* d,
                  const std::string& response_data, bool success)
-    : TestURLFetcher(0, url, request_type, d),
+    : TestURLFetcher(0, url, d),
       ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
     set_status(net::URLRequestStatus(
-        success ? net::URLRequestStatus::SUCCESS :net::URLRequestStatus::FAILED,
+        success ? net::URLRequestStatus::SUCCESS :
+            net::URLRequestStatus::FAILED,
         0));
     set_response_code(success ? 200 : 500);
     SetResponseString(response_data);
   }
 
   // Start the request.  This will call the given delegate asynchronously
   // with the pre-baked response as parameter.
   virtual void Start() OVERRIDE {
     MessageLoop::current()->PostTask(
         FROM_HERE,
         method_factory_.NewRunnableMethod(&FakeURLFetcher::RunDelegate));
   }
 
-  virtual const GURL& GetUrl() const OVERRIDE {
-    return TestURLFetcher::GetOriginalUrl();
+  virtual const GURL& GetURL() const OVERRIDE {
+    return TestURLFetcher::GetOriginalURL();
   }
 
  private:
   virtual ~FakeURLFetcher() {
   }
 
   // This is the method which actually calls the delegate that is passed in the
   // constructor.
   void RunDelegate() {
     delegate()->OnURLFetchComplete(this);
@@ skipping 25 matching lines @@
   FakeResponseMap::const_iterator it = fake_responses_.find(url);
   if (it == fake_responses_.end()) {
     if (default_factory_ == NULL) {
       // If we don't have a baked response for that URL we return NULL.
       DLOG(ERROR) << "No baked response for URL: " << url.spec();
       return NULL;
     } else {
       return default_factory_->CreateURLFetcher(id, url, request_type, d);
     }
   }
-  return new FakeURLFetcher(url, request_type, d,
-                            it->second.first, it->second.second);
+  return new FakeURLFetcher(url, d, it->second.first, it->second.second);
 }
 
 void FakeURLFetcherFactory::SetFakeResponse(const std::string& url,
                                             const std::string& response_data,
                                             bool success) {
   // Overwrite existing URL if it already exists.
   fake_responses_[GURL(url)] = std::make_pair(response_data, success);
 }
 
 void FakeURLFetcherFactory::ClearFakeResponses() {
   fake_responses_.clear();
 }
 
-URLFetcherFactory::URLFetcherFactory() {}
+URLFetcherImplFactory::URLFetcherImplFactory() {}
 
-URLFetcherFactory::~URLFetcherFactory() {}
+URLFetcherImplFactory::~URLFetcherImplFactory() {}
 
-content::URLFetcher* URLFetcherFactory::CreateURLFetcher(
+content::URLFetcher* URLFetcherImplFactory::CreateURLFetcher(
     int id,
     const GURL& url,
     content::URLFetcher::RequestType request_type,
     content::URLFetcherDelegate* d) {
   return new URLFetcherImpl(url, request_type, d);
 }