WIP - do not commit

components/domain_reliability/service.cc

 // Copyright 2014 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 "components/domain_reliability/service.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/single_thread_task_runner.h"
+#include "base/task_runner_util.h"
 #include "components/domain_reliability/monitor.h"
 #include "net/url_request/url_request_context_getter.h"
 
 namespace domain_reliability {
 
 namespace {
 
-void GetWebUIDataOnNetworkTaskRunner(
-    base::WeakPtr<DomainReliabilityMonitor> monitor,
-    scoped_ptr<const base::Value>* data_out) {
-  if (monitor)
-    *data_out = monitor->GetWebUIData();
-}
+scoped_ptr<const base::Value> MaybeGetWebUIData(
+    base::WeakPtr<DomainReliabilityMonitor> monitor) {
+  if (!monitor)
+    return scoped_ptr<const base::Value>();
 
-void CallGetWebUIDataCallbackAndDeleteDataPointer(
-    const base::Callback<void(scoped_ptr<const base::Value>)>& callback,
-    scoped_ptr<const base::Value>* data_in) {
-  callback.Run(data_in->Pass());
-  delete data_in;
+  return monitor->GetWebUIData();
 }
 
 }  // namespace
 
 class DomainReliabilityServiceImpl : public DomainReliabilityService {
  public:
   explicit DomainReliabilityServiceImpl(
       const std::string& upload_reporter_string)
       : upload_reporter_string_(upload_reporter_string) {}
 
@@ skipping 24 matching lines @@
                    monitor_,
                    clear_mode),
         callback);
   }
 
   virtual void GetWebUIData(
       const base::Callback<void(scoped_ptr<const base::Value>)>& callback)
       const OVERRIDE {
     DCHECK(network_task_runner_);
 
-    scoped_ptr<const base::Value>* data =
-        new scoped_ptr<const base::Value>(new base::DictionaryValue());
-    network_task_runner_->PostTaskAndReply(FROM_HERE,
-        base::Bind(&GetWebUIDataOnNetworkTaskRunner,
-                   monitor_,
-                   data),
-        base::Bind(&CallGetWebUIDataCallbackAndDeleteDataPointer,
-                   callback,
-                   data));
+    base::PostTaskAndReplyWithResult(
+        network_task_runner_,
+        FROM_HERE,
+        base::Bind(&MaybeGetWebUIData,
+                   monitor_),
+        callback);
   }
 
  private:
   std::string upload_reporter_string_;
   base::WeakPtr<DomainReliabilityMonitor> monitor_;
   scoped_refptr<base::SequencedTaskRunner> network_task_runner_;
 };
 
 // static
 DomainReliabilityService* DomainReliabilityService::Create(
     const std::string& upload_reporter_string) {
   return new DomainReliabilityServiceImpl(upload_reporter_string);
 }
 
 DomainReliabilityService::~DomainReliabilityService() {}
 
 DomainReliabilityService::DomainReliabilityService() {}
 
 }  // namespace domain_reliability