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

content/renderer/service_worker/service_worker_context_client.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 "content/renderer/service_worker/service_worker_context_client.h"
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 23 matching lines @@
 #include "content/public/renderer/document_state.h"
 #include "content/renderer/background_sync/background_sync_client_impl.h"
 #include "content/renderer/devtools/devtools_agent.h"
 #include "content/renderer/render_thread_impl.h"
 #include "content/renderer/service_worker/embedded_worker_dispatcher.h"
 #include "content/renderer/service_worker/service_worker_type_util.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_macros.h"
 #include "third_party/WebKit/public/platform/WebCrossOriginServiceWorkerClient.h"
 #include "third_party/WebKit/public/platform/WebMessagePortChannel.h"
+#include "third_party/WebKit/public/platform/WebPassOwnPtr.h"
 #include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
 #include "third_party/WebKit/public/platform/WebServiceWorkerClientQueryOptions.h"
 #include "third_party/WebKit/public/platform/WebServiceWorkerRequest.h"
 #include "third_party/WebKit/public/platform/WebServiceWorkerResponse.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/modules/background_sync/WebSyncRegistration.h"
 #include "third_party/WebKit/public/platform/modules/notifications/WebNotificationData.h"
 #include "third_party/WebKit/public/web/WebDataSource.h"
 #include "third_party/WebKit/public/web/WebServiceWorkerContextClient.h"
 #include "third_party/WebKit/public/web/WebServiceWorkerContextProxy.h"
@@ skipping 732 matching lines @@
 void ServiceWorkerContextClient::OnDidGetClients(
     int request_id, const std::vector<ServiceWorkerClientInfo>& clients) {
   TRACE_EVENT0("ServiceWorker",
                "ServiceWorkerContextClient::OnDidGetClients");
   blink::WebServiceWorkerClientsCallbacks* callbacks =
       context_->clients_callbacks.Lookup(request_id);
   if (!callbacks) {
     NOTREACHED() << "Got stray response: " << request_id;
     return;
   }
-  scoped_ptr<blink::WebServiceWorkerClientsInfo> info(
-      new blink::WebServiceWorkerClientsInfo);
+  blink::WebServiceWorkerClientsInfo info;
   blink::WebVector<blink::WebServiceWorkerClientInfo> convertedClients(
       clients.size());
   for (size_t i = 0; i < clients.size(); ++i)
     convertedClients[i] = ToWebServiceWorkerClientInfo(clients[i]);
-  info->clients.swap(convertedClients);
-  callbacks->onSuccess(info.release());
+  info.clients.swap(convertedClients);
+  callbacks->onSuccess(info);
   context_->clients_callbacks.Remove(request_id);
 }
 
 void ServiceWorkerContextClient::OnOpenWindowResponse(
     int request_id,
     const ServiceWorkerClientInfo& client) {
   TRACE_EVENT0("ServiceWorker",
                "ServiceWorkerContextClient::OnOpenWindowResponse");
   blink::WebServiceWorkerClientCallbacks* callbacks =
       context_->client_callbacks.Lookup(request_id);
   if (!callbacks) {
     NOTREACHED() << "Got stray response: " << request_id;
     return;
   }
   scoped_ptr<blink::WebServiceWorkerClientInfo> web_client;
   if (!client.IsEmpty()) {
     DCHECK(client.IsValid());
     web_client.reset(new blink::WebServiceWorkerClientInfo(
         ToWebServiceWorkerClientInfo(client)));
   }
-  callbacks->onSuccess(web_client.release());
+  callbacks->onSuccess(adoptWebPtr(web_client.release()));
   context_->client_callbacks.Remove(request_id);
 }
 
 void ServiceWorkerContextClient::OnOpenWindowError(
     int request_id,
     const std::string& message) {
   TRACE_EVENT0("ServiceWorker",
                "ServiceWorkerContextClient::OnOpenWindowError");
   blink::WebServiceWorkerClientCallbacks* callbacks =
       context_->client_callbacks.Lookup(request_id);
   if (!callbacks) {
     NOTREACHED() << "Got stray response: " << request_id;
     return;
   }
-  scoped_ptr<blink::WebServiceWorkerError> error(
-      new blink::WebServiceWorkerError(
-          blink::WebServiceWorkerError::ErrorTypeUnknown,
-          blink::WebString::fromUTF8(message)));
-  callbacks->onError(error.release());
+  callbacks->onError(blink::WebServiceWorkerError(
+      blink::WebServiceWorkerError::ErrorTypeUnknown,
+      blink::WebString::fromUTF8(message)));
   context_->client_callbacks.Remove(request_id);
 }
 
 void ServiceWorkerContextClient::OnFocusClientResponse(
     int request_id, const ServiceWorkerClientInfo& client) {
   TRACE_EVENT0("ServiceWorker",
                "ServiceWorkerContextClient::OnFocusClientResponse");
   blink::WebServiceWorkerClientCallbacks* callback =
       context_->client_callbacks.Lookup(request_id);
   if (!callback) {
     NOTREACHED() << "Got stray response: " << request_id;
     return;
   }
   if (!client.IsEmpty()) {
     DCHECK(client.IsValid());
     scoped_ptr<blink::WebServiceWorkerClientInfo> web_client (
         new blink::WebServiceWorkerClientInfo(
             ToWebServiceWorkerClientInfo(client)));
-    callback->onSuccess(web_client.release());
+    callback->onSuccess(adoptWebPtr(web_client.release()));
   } else {
-    scoped_ptr<blink::WebServiceWorkerError> error(
-        new blink::WebServiceWorkerError(
-            blink::WebServiceWorkerError::ErrorTypeNotFound,
-            "The WindowClient was not found."));
-    callback->onError(error.release());
+    callback->onError(blink::WebServiceWorkerError(
+        blink::WebServiceWorkerError::ErrorTypeNotFound,
+        "The WindowClient was not found."));
   }
 
   context_->client_callbacks.Remove(request_id);
 }
 
 void ServiceWorkerContextClient::OnNavigateClientResponse(
     int request_id,
     const ServiceWorkerClientInfo& client) {
   TRACE_EVENT0("ServiceWorker",
                "ServiceWorkerContextClient::OnNavigateClientResponse");
   blink::WebServiceWorkerClientCallbacks* callbacks =
       context_->client_callbacks.Lookup(request_id);
   if (!callbacks) {
     NOTREACHED() << "Got stray response: " << request_id;
     return;
   }
   scoped_ptr<blink::WebServiceWorkerClientInfo> web_client;
   if (!client.IsEmpty()) {
     DCHECK(client.IsValid());
     web_client.reset(new blink::WebServiceWorkerClientInfo(
         ToWebServiceWorkerClientInfo(client)));
   }
-  callbacks->onSuccess(web_client.release());
+  callbacks->onSuccess(adoptWebPtr(web_client.release()));
   context_->client_callbacks.Remove(request_id);
 }
 
 void ServiceWorkerContextClient::OnNavigateClientError(int request_id,
                                                        const GURL& url) {
   TRACE_EVENT0("ServiceWorker",
                "ServiceWorkerContextClient::OnNavigateClientError");
   blink::WebServiceWorkerClientCallbacks* callbacks =
       context_->client_callbacks.Lookup(request_id);
   if (!callbacks) {
     NOTREACHED() << "Got stray response: " << request_id;
     return;
   }
   std::string message = "Cannot navigate to URL: " + url.spec();
-  scoped_ptr<blink::WebServiceWorkerError> error(
-      new blink::WebServiceWorkerError(
-          blink::WebServiceWorkerError::ErrorTypeUnknown,
-          blink::WebString::fromUTF8(message)));
-  callbacks->onError(error.release());
+  callbacks->onError(blink::WebServiceWorkerError(
+      blink::WebServiceWorkerError::ErrorTypeUnknown,
+      blink::WebString::fromUTF8(message)));
   context_->client_callbacks.Remove(request_id);
 }
 
 void ServiceWorkerContextClient::OnDidSkipWaiting(int request_id) {
   TRACE_EVENT0("ServiceWorker",
                "ServiceWorkerContextClient::OnDidSkipWaiting");
   blink::WebServiceWorkerSkipWaitingCallbacks* callbacks =
       context_->skip_waiting_callbacks.Lookup(request_id);
   if (!callbacks) {
     NOTREACHED() << "Got stray response: " << request_id;
@@ skipping 21 matching lines @@
     blink::WebServiceWorkerError::ErrorType error_type,
     const base::string16& message) {
   TRACE_EVENT0("ServiceWorker",
                "ServiceWorkerContextClient::OnClaimClientsError");
   blink::WebServiceWorkerClientsClaimCallbacks* callbacks =
       context_->claim_clients_callbacks.Lookup(request_id);
   if (!callbacks) {
     NOTREACHED() << "Got stray response: " << request_id;
     return;
   }
-  scoped_ptr<blink::WebServiceWorkerError> error(
-      new blink::WebServiceWorkerError(error_type, message));
-  callbacks->onError(error.release());
+  callbacks->onError(blink::WebServiceWorkerError(error_type, message));
   context_->claim_clients_callbacks.Remove(request_id);
 }
 
 void ServiceWorkerContextClient::OnPing() {
   Send(new ServiceWorkerHostMsg_Pong(GetRoutingID()));
 }
 
 base::WeakPtr<ServiceWorkerContextClient>
 ServiceWorkerContextClient::GetWeakPtr() {
   DCHECK(worker_task_runner_->RunsTasksOnCurrentThread());
   DCHECK(context_);
   return context_->weak_factory.GetWeakPtr();
 }
 
 }  // namespace content