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

chrome/browser/safe_browsing/two_phase_uploader.cc

 // Copyright 2013 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 "chrome/browser/safe_browsing/two_phase_uploader.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/task_runner.h"
 #include "net/base/net_errors.h"
@@ skipping 142 matching lines @@
   DCHECK(CalledOnValidThread());
   DVLOG(3) << __FUNCTION__ << " " << source->GetURL().spec()
            << " " << current << "/" << total;
   if (state_ == UPLOAD_FILE && !progress_callback_.is_null())
     progress_callback_.Run(current, total);
 }
 
 void TwoPhaseUploaderImpl::UploadMetadata() {
   DCHECK(CalledOnValidThread());
   state_ = UPLOAD_METADATA;
-  url_fetcher_.reset(net::URLFetcher::Create(base_url_, net::URLFetcher::POST,
-                                             this));
+  url_fetcher_ =
+      net::URLFetcher::Create(base_url_, net::URLFetcher::POST, this);
   url_fetcher_->SetRequestContext(url_request_context_getter_.get());
   url_fetcher_->SetExtraRequestHeaders(kStartHeader);
   url_fetcher_->SetUploadData(kUploadContentType, metadata_);
   url_fetcher_->Start();
 }
 
 void TwoPhaseUploaderImpl::UploadFile() {
   DCHECK(CalledOnValidThread());
   state_ = UPLOAD_FILE;
 
-  url_fetcher_.reset(net::URLFetcher::Create(upload_url_, net::URLFetcher::PUT,
-                                             this));
+  url_fetcher_ =
+      net::URLFetcher::Create(upload_url_, net::URLFetcher::PUT, this);
   url_fetcher_->SetRequestContext(url_request_context_getter_.get());
   url_fetcher_->SetUploadFilePath(
       kUploadContentType, file_path_, 0, kuint64max, file_task_runner_);
   url_fetcher_->Start();
 }
 
 void TwoPhaseUploaderImpl::Finish(int net_error,
                                   int response_code,
                                   const std::string& response) {
   DCHECK(CalledOnValidThread());
@@ skipping 15 matching lines @@
     const ProgressCallback& progress_callback,
     const FinishCallback& finish_callback) {
   if (!TwoPhaseUploader::factory_)
     return new TwoPhaseUploaderImpl(
         url_request_context_getter, file_task_runner, base_url, metadata,
         file_path, progress_callback, finish_callback);
   return TwoPhaseUploader::factory_->CreateTwoPhaseUploader(
       url_request_context_getter, file_task_runner, base_url, metadata,
       file_path, progress_callback, finish_callback);
 }