Use base::ResetAndReturn() in remoting.

remoting/test/remote_host_info_fetcher.cc

 // Copyright 2015 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 "remoting/test/remote_host_info_fetcher.h"
 
 #include "base/bind.h"
+#include "base/callback_helpers.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/values.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/url_fetcher.h"
@@ skipping 63 matching lines @@
 
 void RemoteHostInfoFetcher::OnURLFetchComplete(const net::URLFetcher* source) {
   DCHECK(source);
   DVLOG(2) << "URL Fetch Completed for: " << source->GetOriginalURL();
 
   RemoteHostInfo remote_host_info;
   int response_code = request_->GetResponseCode();
   if (response_code != net::HTTP_OK) {
     LOG(ERROR) << "RemoteHostInfo request failed with error code: "
                << response_code;
-    remote_host_info_callback_.Run(remote_host_info);
-    remote_host_info_callback_.Reset();
+    base::ResetAndReturn(&remote_host_info_callback_).Run(remote_host_info);
     return;
   }
 
   std::string response_string;
   if (!request_->GetResponseAsString(&response_string)) {
     LOG(ERROR) << "Failed to retrieve RemoteHostInfo response data";
-    remote_host_info_callback_.Run(remote_host_info);
-    remote_host_info_callback_.Reset();
+    base::ResetAndReturn(&remote_host_info_callback_).Run(remote_host_info);
     return;
   }
 
   scoped_ptr<base::Value> response_value(
       base::JSONReader::Read(response_string));
   if (!response_value ||
       !response_value->IsType(base::Value::TYPE_DICTIONARY)) {
     LOG(ERROR) << "Failed to parse response string to JSON";
-    remote_host_info_callback_.Run(remote_host_info);
-    remote_host_info_callback_.Reset();
+    base::ResetAndReturn(&remote_host_info_callback_).Run(remote_host_info);
     return;
   }
 
   std::string remote_host_status;
   const base::DictionaryValue* response;
   if (response_value->GetAsDictionary(&response)) {
     response->GetString("status", &remote_host_status);
   } else {
     LOG(ERROR) << "Failed to convert parsed JSON to a dictionary object";
-    remote_host_info_callback_.Run(remote_host_info);
-    remote_host_info_callback_.Reset();
+    base::ResetAndReturn(&remote_host_info_callback_).Run(remote_host_info);
     return;
   }
 
   remote_host_info.SetRemoteHostStatusFromString(remote_host_status);
 
   if (remote_host_info.IsReadyForConnection()) {
     response->GetString("host.applicationId", &remote_host_info.application_id);
     response->GetString("host.hostId", &remote_host_info.host_id);
     response->GetString("hostJid", &remote_host_info.host_jid);
     response->GetString("authorizationCode",
                         &remote_host_info.authorization_code);
     response->GetString("sharedSecret", &remote_host_info.shared_secret);
   }
 
-  remote_host_info_callback_.Run(remote_host_info);
-  remote_host_info_callback_.Reset();
+  base::ResetAndReturn(&remote_host_info_callback_).Run(remote_host_info);
 }
 
 }  // namespace test
 }  // namespace remoting