Replace URLRequestFailedDnsJob with URLRequestFailedJob

content/test/net/url_request_failed_job.h

Index: content/test/net/url_request_failed_job.h
===================================================================
--- content/test/net/url_request_failed_job.h	(revision 126703)
+++ content/test/net/url_request_failed_job.h	(working copy)
@@ -1,38 +1,49 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
-// This class simulates what wininet does when a dns lookup fails.
 
-#ifndef CONTENT_TEST_NET_URL_REQUEST_FAILED_DNS_JOB_H_
-#define CONTENT_TEST_NET_URL_REQUEST_FAILED_DNS_JOB_H_
+#ifndef CONTENT_TEST_NET_URL_REQUEST_FAILED_JOB_H_
+#define CONTENT_TEST_NET_URL_REQUEST_FAILED_JOB_H_
 #pragma once
 
+#include <string>
+
+#include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
 #include "content/common/content_export.h"
+#include "googleurl/src/gurl.h"
 #include "net/url_request/url_request_job.h"
 
-class URLRequestFailedDnsJob : public net::URLRequestJob {
+// This class simulates a URLRequestJob failing with a given error code while
+// trying to connect.
+class URLRequestFailedJob : public net::URLRequestJob,
+                            public base::SupportsWeakPtr<URLRequestFailedJob> {
  public:
-  explicit URLRequestFailedDnsJob(net::URLRequest* request);
+  URLRequestFailedJob(net::URLRequest* request, int net_error);
 
   virtual void Start() OVERRIDE;
 
-  static net::URLRequestJob* Factory(net::URLRequest* request,
-                                     const std::string& scheme);
-
-  // A test URL that can be used in UI tests.
-  CONTENT_EXPORT static const char kTestUrl[];
-
   // Adds the testing URLs to the net::URLRequestFilter.
   CONTENT_EXPORT static void AddUrlHandler();
 
+  // Given a net error code, constructs a mock URL that will return that error
+  // asynchronously when started.  |net_error| must be a valid net error code
+  // other than net::OK and net::ERR_IO_PENDING.
+  CONTENT_EXPORT static GURL GetMockHttpUrl(int net_error);
+  CONTENT_EXPORT static GURL GetMockHttpsUrl(int net_error);
+
  private:
-  virtual ~URLRequestFailedDnsJob();
+  static net::URLRequestJob* Factory(net::URLRequest* request,
+                                     const std::string& scheme);
 
-  // Simulate a DNS failure.
+  virtual ~URLRequestFailedJob();
+
+  // Simulate a failure.
   void StartAsync();
 
-  base::WeakPtrFactory<URLRequestFailedDnsJob> weak_factory_;

[willchan no longer on Chromium, 2012/03/15 22:42:28]

Why are we using SupportsWeakPtr instead of a WeakPtrFactory? I prefer not
having the public AsWeakPtr() method unless we need it.

[mmenke, 2012/03/15 22:55:46]

Mostly because it's not publicly accessible anyways (Without casting, at least),
and I find "ALLOW_THIS_IN_INITIALIZER_LIST" hideous.

Switched back to using WeakPtrFactory.

+  const int net_error_;
+
+  DISALLOW_COPY_AND_ASSIGN(URLRequestFailedJob);
 };
 
-#endif  // CONTENT_TEST_NET_URL_REQUEST_FAILED_DNS_JOB_H_
+#endif  // CONTENT_TEST_NET_URL_REQUEST_FAILED_JOB_H_