[VR, Permission] Use appopriate type parameters for WebCallbacks (2/3)

content/child/permissions/permission_dispatcher.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/child/permissions/permission_dispatcher.h"
 
 #include "base/callback.h"
 #include "content/child/worker_task_runner.h"
 #include "content/public/common/service_registry.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
@@ skipping 203 matching lines @@
       GetPermissionStatus(status),
       base::Bind(&PermissionDispatcher::OnPermissionChangedForWorker,
                  base::Unretained(this),
                  worker_thread_id,
                  callback));
 }
 
 // static
 void PermissionDispatcher::RunCallbackOnWorkerThread(
     blink::WebPermissionCallback* callback,
-    scoped_ptr<blink::WebPermissionStatus> status) {
-  callback->onSuccess(status.release());
+    blink::WebPermissionStatus status) {
+  callback->onSuccess(status);
   delete callback;
 }
 
 PermissionServicePtr& PermissionDispatcher::GetPermissionServicePtr() {
   if (!permission_service_.get()) {
     service_registry_->ConnectToRemoteService(
         mojo::GetProxy(&permission_service_));
   }
   return permission_service_;
 }
@@ skipping 54 matching lines @@
       base::Bind(&PermissionDispatcher::OnPermissionResponse,
                  base::Unretained(this),
                  request_id));
 }
 
 void PermissionDispatcher::OnPermissionResponse(int request_id,
                                                 PermissionStatus result) {
   CallbackInformation* callback_information =
       pending_callbacks_.Lookup(request_id);
   DCHECK(callback_information && callback_information->callback());
-  scoped_ptr<blink::WebPermissionStatus> status(
-      new blink::WebPermissionStatus(GetWebPermissionStatus(result)));
+  blink::WebPermissionStatus status = GetWebPermissionStatus(result);
 
   if (callback_information->worker_thread_id() != kNoWorkerThread) {
     blink::WebPermissionCallback* callback =
         callback_information->ReleaseCallback();
     int worker_thread_id = callback_information->worker_thread_id();
     pending_callbacks_.Remove(request_id);
 
     // If the worker is no longer running, ::PostTask() will return false and
     // gracefully fail, destroying the callback too.
     WorkerTaskRunner::Instance()->PostTask(
         worker_thread_id,
         base::Bind(&PermissionDispatcher::RunCallbackOnWorkerThread,
-                   base::Unretained(callback),
-                   base::Passed(&status)));
+                   base::Unretained(callback), status));
     return;
   }
 
-  callback_information->callback()->onSuccess(status.release());
+  callback_information->callback()->onSuccess(status);
   pending_callbacks_.Remove(request_id);
 }
 
 void PermissionDispatcher::OnPermissionChanged(
     blink::WebPermissionType type,
     const std::string& origin,
     WebPermissionObserver* observer,
     PermissionStatus status) {
   if (!IsObserverRegistered(observer))
     return;
@@ skipping 23 matching lines @@
       origin,
       current_status,
       base::Bind(&PermissionDispatcher::OnPermissionChanged,
                  base::Unretained(this),
                  type,
                  origin,
                  base::Unretained(observer)));
 }
 
 }  // namespace content