Mojo C++ bindings: make permissions service use STL string/vector types

content/browser/permissions/permission_service_impl.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/browser/permissions/permission_service_impl.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 33 matching lines @@
   }
 
   NOTREACHED();
   return PermissionType::NUM;
 }
 
 // This function allows the usage of the the multiple request map
 // with single requests.
 void PermissionRequestResponseCallbackWrapper(
     const base::Callback<void(PermissionStatus)>& callback,
-    mojo::Array<PermissionStatus> vector) {
+    const std::vector<PermissionStatus>& vector) {
   DCHECK_EQ(vector.size(), 1ul);
   callback.Run(vector[0]);
 }
 
 } // anonymous namespace
 
 PermissionServiceImpl::PendingRequest::PendingRequest(
     const RequestPermissionsCallback& callback,
     int request_count)
     : callback(callback),
       request_count(request_count) {
 }
 
 PermissionServiceImpl::PendingRequest::~PendingRequest() {
   if (callback.is_null())
     return;
 
-  mojo::Array<PermissionStatus> result =
-      mojo::Array<PermissionStatus>::New(request_count);
-  for (int i = 0; i < request_count; ++i)
-    result[i] = PermissionStatus::DENIED;
-  callback.Run(std::move(result));
+  std::vector<PermissionStatus> result(request_count, PermissionStatus::DENIED);
+  callback.Run(result);
 }
 
 PermissionServiceImpl::PendingSubscription::PendingSubscription(
     PermissionType permission,
     const GURL& origin,
     const PermissionStatusCallback& callback)
     : id(-1),
       permission(permission),
       origin(origin),
       callback(callback) {
@@ skipping 20 matching lines @@
 }
 
 void PermissionServiceImpl::OnConnectionError() {
   CancelPendingOperations();
   context_->ServiceHadConnectionError(this);
   // After that call, |this| will be deleted.
 }
 
 void PermissionServiceImpl::RequestPermission(
     PermissionName permission,
-    const mojo::String& origin,
+    const std::string& origin,
     bool user_gesture,
     const PermissionStatusCallback& callback) {
   // This condition is valid if the call is coming from a ChildThread instead of
   // a RenderFrame. Some consumers of the service run in Workers and some in
   // Frames. In the context of a Worker, it is not possible to show a
   // permission prompt because there is no tab. In the context of a Frame, we
   // can. Even if the call comes from a context where it is not possible to show
   // any UI, we want to still return something relevant so the current
   // permission status is returned.
   BrowserContext* browser_context = context_->GetBrowserContext();
   DCHECK(browser_context);
   if (!context_->render_frame_host() ||
       !browser_context->GetPermissionManager()) {
-    callback.Run(GetPermissionStatusFromName(permission, GURL(origin.get())));
+    callback.Run(GetPermissionStatusFromName(permission, GURL(origin)));
     return;
   }
 
   int pending_request_id = pending_requests_.Add(new PendingRequest(
       base::Bind(&PermissionRequestResponseCallbackWrapper, callback), 1));
   int id = browser_context->GetPermissionManager()->RequestPermission(
-      PermissionNameToPermissionType(permission),
-      context_->render_frame_host(),
-      GURL(origin.get()),
-      user_gesture,
+      PermissionNameToPermissionType(permission), context_->render_frame_host(),
+      GURL(origin), user_gesture,
       base::Bind(&PermissionServiceImpl::OnRequestPermissionResponse,
-                 weak_factory_.GetWeakPtr(),
-                 pending_request_id));
+                 weak_factory_.GetWeakPtr(), pending_request_id));
 
   // Check if the request still exists. It might have been removed by the
   // callback if it was run synchronously.
   PendingRequest* pending_request = pending_requests_.Lookup(
       pending_request_id);
   if (!pending_request)
       return;
   pending_request->id = id;
 }
 
 void PermissionServiceImpl::OnRequestPermissionResponse(
     int pending_request_id,
     PermissionStatus status) {
   OnRequestPermissionsResponse(pending_request_id,
                                std::vector<PermissionStatus>(1, status));
 }
 
 void PermissionServiceImpl::RequestPermissions(
-    mojo::Array<PermissionName> permissions,
-    const mojo::String& origin,
+    const std::vector<PermissionName>& permissions,
+    const std::string& origin,
     bool user_gesture,
     const RequestPermissionsCallback& callback) {
-  if (permissions.is_null()) {
-    callback.Run(mojo::Array<PermissionStatus>());
-    return;
-  }
-
   // This condition is valid if the call is coming from a ChildThread instead of
   // a RenderFrame. Some consumers of the service run in Workers and some in
   // Frames. In the context of a Worker, it is not possible to show a
   // permission prompt because there is no tab. In the context of a Frame, we
   // can. Even if the call comes from a context where it is not possible to show
   // any UI, we want to still return something relevant so the current
   // permission status is returned for each permission.
   BrowserContext* browser_context = context_->GetBrowserContext();
   DCHECK(browser_context);
   if (!context_->render_frame_host() ||
       !browser_context->GetPermissionManager()) {
-    mojo::Array<PermissionStatus> result(permissions.size());
+    std::vector<PermissionStatus> result(permissions.size());
     for (size_t i = 0; i < permissions.size(); ++i) {
-      result[i] =
-          GetPermissionStatusFromName(permissions[i], GURL(origin.get()));
+      result[i] = GetPermissionStatusFromName(permissions[i], GURL(origin));
     }
-    callback.Run(std::move(result));
+    callback.Run(result);
     return;
   }
 
   std::vector<PermissionType> types(permissions.size());
   for (size_t i = 0; i < types.size(); ++i)
     types[i] = PermissionNameToPermissionType(permissions[i]);
 
   int pending_request_id = pending_requests_.Add(
       new PendingRequest(callback, permissions.size()));
   int id = browser_context->GetPermissionManager()->RequestPermissions(
-      types,
-      context_->render_frame_host(),
-      GURL(origin.get()),
-      user_gesture,
+      types, context_->render_frame_host(), GURL(origin), user_gesture,
       base::Bind(&PermissionServiceImpl::OnRequestPermissionsResponse,
-                 weak_factory_.GetWeakPtr(),
-                 pending_request_id));
+                 weak_factory_.GetWeakPtr(), pending_request_id));
 
   // Check if the request still exists. It may have been removed by the
   // the response callback.
   PendingRequest* pending_request = pending_requests_.Lookup(
       pending_request_id);
   if (!pending_request)
       return;
   pending_request->id = id;
 }
 
 void PermissionServiceImpl::OnRequestPermissionsResponse(
     int pending_request_id,
     const std::vector<PermissionStatus>& result) {
   PendingRequest* request = pending_requests_.Lookup(pending_request_id);
   RequestPermissionsCallback callback(request->callback);
   request->callback.Reset();
   pending_requests_.Remove(pending_request_id);
-  callback.Run(mojo::Array<PermissionStatus>::From(result));
+  callback.Run(result);
 }
 
 void PermissionServiceImpl::CancelPendingOperations() {
   DCHECK(context_->GetBrowserContext());
 
   PermissionManager* permission_manager =
       context_->GetBrowserContext()->GetPermissionManager();
   if (!permission_manager)
     return;
 
@@ skipping 12 matching lines @@
         it.GetCurrentValue()->permission, it.GetCurrentValue()->origin));
     it.GetCurrentValue()->callback.Reset();
     permission_manager->UnsubscribePermissionStatusChange(
         it.GetCurrentValue()->id);
   }
   pending_subscriptions_.Clear();
 }
 
 void PermissionServiceImpl::HasPermission(
     PermissionName permission,
-    const mojo::String& origin,
+    const std::string& origin,
     const PermissionStatusCallback& callback) {
-  callback.Run(GetPermissionStatusFromName(permission, GURL(origin.get())));
+  callback.Run(GetPermissionStatusFromName(permission, GURL(origin)));
 }
 
 void PermissionServiceImpl::RevokePermission(
     PermissionName permission,
-    const mojo::String& origin,
+    const std::string& origin,
     const PermissionStatusCallback& callback) {
-  GURL origin_url(origin.get());
+  GURL origin_url(origin);
   PermissionType permission_type = PermissionNameToPermissionType(permission);
   PermissionStatus status =
       GetPermissionStatusFromType(permission_type, origin_url);
 
   // Resetting the permission should only be possible if the permission is
   // already granted.
   if (status != PermissionStatus::GRANTED) {
     callback.Run(status);
     return;
   }
 
   ResetPermissionStatus(permission_type, origin_url);
 
   callback.Run(GetPermissionStatusFromType(permission_type, origin_url));
 }
 
 void PermissionServiceImpl::GetNextPermissionChange(
     PermissionName permission,
-    const mojo::String& mojo_origin,
+    const std::string& mojo_origin,
     PermissionStatus last_known_status,
     const PermissionStatusCallback& callback) {
-  GURL origin(mojo_origin.get());
+  GURL origin(mojo_origin);
   PermissionStatus current_status =
       GetPermissionStatusFromName(permission, origin);
   if (current_status != last_known_status) {
     callback.Run(current_status);
     return;
   }
 
   BrowserContext* browser_context = context_->GetBrowserContext();
   DCHECK(browser_context);
   if (!browser_context->GetPermissionManager()) {
@@ skipping 71 matching lines @@
 
   PermissionStatusCallback callback = subscription->callback;
 
   subscription->callback.Reset();
   pending_subscriptions_.Remove(pending_subscription_id);
 
   callback.Run(status);
 }
 
 }  // namespace content