Adjust URLFetcher::Create API so that object is returned as scoped_ptr.

net/url_request/test_url_fetcher_factory.cc

Index: net/url_request/test_url_fetcher_factory.cc
diff --git a/net/url_request/test_url_fetcher_factory.cc b/net/url_request/test_url_fetcher_factory.cc
index 6dc9367ad473ffc68abbee3d689690de12476c95..207d2857d5d6afaa2f1aca704520c6e93c16ea0b 100644
--- a/net/url_request/test_url_fetcher_factory.cc
+++ b/net/url_request/test_url_fetcher_factory.cc
@@ -300,7 +300,7 @@ TestURLFetcherFactory::TestURLFetcherFactory()
 
 TestURLFetcherFactory::~TestURLFetcherFactory() {}
 
-URLFetcher* TestURLFetcherFactory::CreateURLFetcher(
+scoped_ptr<URLFetcher> TestURLFetcherFactory::CreateURLFetcher(
     int id,
     const GURL& url,
     URLFetcher::RequestType request_type,
@@ -310,7 +310,7 @@ URLFetcher* TestURLFetcherFactory::CreateURLFetcher(
     fetcher->set_owner(this);
   fetcher->SetDelegateForTests(delegate_for_tests_);
   fetchers_[id] = fetcher;
-  return fetcher;
+  return scoped_ptr<URLFetcher>(fetcher);
 }
 
 TestURLFetcher* TestURLFetcherFactory::GetFetcherByID(int id) const {
@@ -399,7 +399,7 @@ scoped_ptr<FakeURLFetcher> FakeURLFetcherFactory::DefaultFakeURLFetcherCreator(
 
 FakeURLFetcherFactory::~FakeURLFetcherFactory() {}
 
-URLFetcher* FakeURLFetcherFactory::CreateURLFetcher(
+scoped_ptr<URLFetcher> FakeURLFetcherFactory::CreateURLFetcher(
     int id,
     const GURL& url,
     URLFetcher::RequestType request_type,
@@ -415,11 +415,10 @@ URLFetcher* FakeURLFetcherFactory::CreateURLFetcher(
     }
   }
 
-  scoped_ptr<FakeURLFetcher> fake_fetcher =
-      creator_.Run(url, d, it->second.response_data,
-                   it->second.response_code, it->second.status);
-  // TODO: Make URLFetcherFactory::CreateURLFetcher return a scoped_ptr
-  return fake_fetcher.release();
+  scoped_ptr<URLFetcher> fake_fetcher =
+      creator_.Run(url, d, it->second.response_data, it->second.response_code,
+                   it->second.status);
+  return fake_fetcher;
 }
 
 void FakeURLFetcherFactory::SetFakeResponse(
@@ -443,12 +442,12 @@ URLFetcherImplFactory::URLFetcherImplFactory() {}
 
 URLFetcherImplFactory::~URLFetcherImplFactory() {}
 
-URLFetcher* URLFetcherImplFactory::CreateURLFetcher(
+scoped_ptr<URLFetcher> URLFetcherImplFactory::CreateURLFetcher(
     int id,
     const GURL& url,
     URLFetcher::RequestType request_type,
     URLFetcherDelegate* d) {
-  return new URLFetcherImpl(url, request_type, d);
+  return scoped_ptr<URLFetcher>(new URLFetcherImpl(url, request_type, d));
 }
 
 }  // namespace net