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

chrome/browser/safe_browsing/client_side_detection_service.cc

Index: chrome/browser/safe_browsing/client_side_detection_service.cc
diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chrome/browser/safe_browsing/client_side_detection_service.cc
index 5dd332a3172e1a1c1ba1020dbcfb0abef7096f1f..e7fab2fcbb6461c891fef12aa7439ade02886e6e 100644
--- a/chrome/browser/safe_browsing/client_side_detection_service.cc
+++ b/chrome/browser/safe_browsing/client_side_detection_service.cc
@@ -273,9 +273,9 @@ void ClientSideDetectionService::StartFetchModel() {
   if (enabled_) {
     // Start fetching the model either from the cache or possibly from the
     // network if the model isn't in the cache.
-    model_fetcher_.reset(net::URLFetcher::Create(
-        0 /* ID used for testing */, GURL(kClientModelUrl),
-        net::URLFetcher::GET, this));
+    model_fetcher_ = net::URLFetcher::Create(0 /* ID used for testing */,
+                                             GURL(kClientModelUrl),
+                                             net::URLFetcher::GET, this);
     model_fetcher_->SetRequestContext(request_context_getter_.get());
     model_fetcher_->Start();
   }
@@ -326,10 +326,10 @@ void ClientSideDetectionService::StartClientReportPhishingRequest(
     return;
   }
 
-  net::URLFetcher* fetcher = net::URLFetcher::Create(
-      0 /* ID used for testing */,
-      GetClientReportUrl(kClientReportPhishingUrl),
-      net::URLFetcher::POST, this);
+  net::URLFetcher* fetcher =
+      net::URLFetcher::Create(0 /* ID used for testing */,
+                              GetClientReportUrl(kClientReportPhishingUrl),
+                              net::URLFetcher::POST, this).release();

[Ryan Sleevi, 2015/04/30 18:23:44]

line 338

 
   // Remember which callback and URL correspond to the current fetcher object.
   ClientReportInfo* info = new ClientReportInfo;
@@ -367,10 +367,10 @@ void ClientSideDetectionService::StartClientReportMalwareRequest(
     return;
   }
 
-  net::URLFetcher* fetcher = net::URLFetcher::Create(
-      0 /* ID used for testing */,
-      GetClientReportUrl(kClientReportMalwareUrl),
-      net::URLFetcher::POST, this);
+  net::URLFetcher* fetcher =
+      net::URLFetcher::Create(0 /* ID used for testing */,
+                              GetClientReportUrl(kClientReportMalwareUrl),
+                              net::URLFetcher::POST, this).release();

[Ryan Sleevi, 2015/04/30 18:23:44]

line 379

[dtapuska, 2015/04/30 19:05:56]

That is the way I started doing this CL; changing to a scoped_ptr and putting a
release on line 379.. but the problem is once the scoped_ptr is released; the
members call the ptr... ie; on like 381 calls fetcher-> and if you added it at
379; then it would be a SEGFAULT. So you could move the code around; putting it
in the table last (but I couldn't convince myself that was correct because it
probably should be in the table *before* Start() is called in-case it fails
synchronously and calls the callback and removes it from the table...

Anyways; I ended up with doing it this way to be the least invasive and
bug-free...

I don't agree with all these classes putting the URLFetcher as the key to the
map. I think the id used to create the fetcher should be used; and then the data
can be a struct of two scoped_ptrs... but then again we don't support std::move
in chromium yet..

 
   // Remember which callback and URL correspond to the current fetcher object.
   ClientMalwareReportInfo* info = new ClientMalwareReportInfo;