CallbackPromiseAdapter types should be more compatible with WebCallbacks (2/3).

content/child/geofencing/geofencing_dispatcher.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 "content/child/geofencing/geofencing_dispatcher.h"
 
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/thread_task_runner_handle.h"
@@ skipping 148 matching lines @@
 void GeofencingDispatcher::OnRegisterRegionComplete(int thread_id,
                                                     int request_id,
                                                     GeofencingStatus status) {
   blink::WebGeofencingCallbacks* callbacks =
       region_registration_requests_.Lookup(request_id);
   DCHECK(callbacks);
 
   if (status == GEOFENCING_STATUS_OK) {
     callbacks->onSuccess();
   } else {
-    callbacks->onError(new WebGeofencingError(
+    callbacks->onError(WebGeofencingError(
         WebGeofencingError::ErrorTypeAbort,
         blink::WebString::fromUTF8(GeofencingStatusToString(status))));
   }
   region_registration_requests_.Remove(request_id);
 }
 
 void GeofencingDispatcher::OnUnregisterRegionComplete(int thread_id,
                                                       int request_id,
                                                       GeofencingStatus status) {
   blink::WebGeofencingCallbacks* callbacks =
       region_unregistration_requests_.Lookup(request_id);
   DCHECK(callbacks);
 
   if (status == GEOFENCING_STATUS_OK) {
     callbacks->onSuccess();
   } else {
-    callbacks->onError(new WebGeofencingError(
+    callbacks->onError(WebGeofencingError(
         WebGeofencingError::ErrorTypeAbort,
         blink::WebString::fromUTF8(GeofencingStatusToString(status))));
   }
   region_unregistration_requests_.Remove(request_id);
 }
 
 void GeofencingDispatcher::OnGetRegisteredRegionsComplete(
     int thread_id,
     int request_id,
     GeofencingStatus status,
     const GeofencingRegistrations& regions) {
   blink::WebGeofencingRegionsCallbacks* callbacks =
       get_registered_regions_requests_.Lookup(request_id);
   DCHECK(callbacks);
 
   if (status == GEOFENCING_STATUS_OK) {
-    scoped_ptr<blink::WebVector<blink::WebGeofencingRegistration>> result(
-        new blink::WebVector<blink::WebGeofencingRegistration>(regions.size()));
+    blink::WebVector<blink::WebGeofencingRegistration> result(regions.size());
     size_t index = 0;
     for (GeofencingRegistrations::const_iterator it = regions.begin();
          it != regions.end();
          ++it, ++index) {
-      (*result)[index].id = blink::WebString::fromUTF8(it->first);
-      (*result)[index].region = it->second;
+      result[index].id = blink::WebString::fromUTF8(it->first);
+      result[index].region = it->second;
     }
-    callbacks->onSuccess(result.release());
+    callbacks->onSuccess(result);
   } else {
-    callbacks->onError(new WebGeofencingError(
+    callbacks->onError(WebGeofencingError(
         WebGeofencingError::ErrorTypeAbort,
         blink::WebString::fromUTF8(GeofencingStatusToString(status))));
   }
   get_registered_regions_requests_.Remove(request_id);
 }
 
 void GeofencingDispatcher::OnWorkerRunLoopStopped() {
   delete this;
 }
 
 }  // namespace content