Change most content::URLFetcher references to net::URLFetcher

content/public/common/url_fetcher.h

Index: content/public/common/url_fetcher.h
diff --git a/content/public/common/url_fetcher.h b/content/public/common/url_fetcher.h
index e1f9c274d604d73000f9866cafeb3f4c0e64fe77..ac5ba60932d1368d36356e04cfa8060d47366d38 100644
--- a/content/public/common/url_fetcher.h
+++ b/content/public/common/url_fetcher.h
@@ -17,22 +17,22 @@ namespace content {
 
 // TODO(akalin): Move the static functions to net::URLFetcher and
 // remove content::URLFetcher.
-class CONTENT_EXPORT URLFetcher : public net::URLFetcher {
+class CONTENT_EXPORT URLFetcher {
  public:
   // |url| is the URL to send the request to.
   // |request_type| is the type of request to make.
   // |d| the object that will receive the callback on fetch completion.
-  static URLFetcher* Create(const GURL& url,
-                            RequestType request_type,
-                            net::URLFetcherDelegate* d);
+  static net::URLFetcher* Create(const GURL& url,
+                                 net::URLFetcher::RequestType request_type,
+                                 net::URLFetcherDelegate* d);
 
   // Like above, but if there's a URLFetcherFactory registered with the
   // implementation it will be used. |id| may be used during testing to identify
   // who is creating the URLFetcher.
-  static URLFetcher* Create(int id,
-                            const GURL& url,
-                            RequestType request_type,
-                            net::URLFetcherDelegate* d);
+  static net::URLFetcher* Create(int id,
+                                 const GURL& url,
+                                 net::URLFetcher::RequestType request_type,
+                                 net::URLFetcherDelegate* d);
 
   // Cancels all existing URLFetchers.  Will notify the URLFetcherDelegates.
   // Note that any new URLFetchers created while this is running will not be