Move geolocation and permission mojoms into WebKit/public/platform.

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 <stddef.h>
 #include <utility>
 
 #include "base/callback.h"
 #include "content/public/child/worker_thread.h"
 #include "content/public/common/service_registry.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/platform/modules/permissions/WebPermissionObserver.h"
 
 using blink::WebPermissionObserver;
+using blink::mojom::PermissionName;
+using blink::mojom::PermissionStatus;
 
 namespace content {
 
 namespace {
 
-mojom::PermissionName GetPermissionName(blink::WebPermissionType type) {
+PermissionName GetPermissionName(blink::WebPermissionType type) {
   switch (type) {
     case blink::WebPermissionTypeGeolocation:
-      return mojom::PermissionName::GEOLOCATION;
+      return PermissionName::GEOLOCATION;
     case blink::WebPermissionTypeNotifications:
-      return mojom::PermissionName::NOTIFICATIONS;
+      return PermissionName::NOTIFICATIONS;
     case blink::WebPermissionTypePushNotifications:
-      return mojom::PermissionName::PUSH_NOTIFICATIONS;
+      return PermissionName::PUSH_NOTIFICATIONS;
     case blink::WebPermissionTypeMidiSysEx:
-      return mojom::PermissionName::MIDI_SYSEX;
+      return PermissionName::MIDI_SYSEX;
     case blink::WebPermissionTypeDurableStorage:
-      return mojom::PermissionName::DURABLE_STORAGE;
+      return PermissionName::DURABLE_STORAGE;
     case blink::WebPermissionTypeMidi:
-      return mojom::PermissionName::MIDI;
+      return PermissionName::MIDI;
     default:
       // The default statement is only there to prevent compilation failures if
       // WebPermissionType enum gets extended.
       NOTREACHED();
-      return mojom::PermissionName::GEOLOCATION;
+      return PermissionName::GEOLOCATION;
   }
 }
 
-mojom::PermissionStatus GetPermissionStatus(blink::WebPermissionStatus status) {
+PermissionStatus GetPermissionStatus(blink::WebPermissionStatus status) {
   switch (status) {
     case blink::WebPermissionStatusGranted:
-      return mojom::PermissionStatus::GRANTED;
+      return PermissionStatus::GRANTED;
     case blink::WebPermissionStatusDenied:
-      return mojom::PermissionStatus::DENIED;
+      return PermissionStatus::DENIED;
     case blink::WebPermissionStatusPrompt:
-      return mojom::PermissionStatus::ASK;
+      return PermissionStatus::ASK;
   }
 
   NOTREACHED();
-  return mojom::PermissionStatus::DENIED;
+  return PermissionStatus::DENIED;
 }
 
-blink::WebPermissionStatus GetWebPermissionStatus(
-    mojom::PermissionStatus status) {
+blink::WebPermissionStatus GetWebPermissionStatus(PermissionStatus status) {
   switch (status) {
-    case mojom::PermissionStatus::GRANTED:
+    case PermissionStatus::GRANTED:
       return blink::WebPermissionStatusGranted;
-    case mojom::PermissionStatus::DENIED:
+    case PermissionStatus::DENIED:
       return blink::WebPermissionStatusDenied;
-    case mojom::PermissionStatus::ASK:
+    case PermissionStatus::ASK:
       return blink::WebPermissionStatusPrompt;
   }
 
   NOTREACHED();
   return blink::WebPermissionStatusDenied;
 }
 
 const int kNoWorkerThread = 0;
 
 }  // anonymous namespace
@@ skipping 55 matching lines @@
 
   RegisterObserver(observer);
 
   GetNextPermissionChange(type, origin.string().utf8(), observer,
                           // We initialize with an arbitrary value because the
                           // mojo service wants a value. Worst case, the
                           // observer will get notified about a non-change which
                           // should be a no-op. After the first notification,
                           // GetNextPermissionChange will be called with the
                           // latest known value.
-                          mojom::PermissionStatus::ASK);
+                          PermissionStatus::ASK);
 }
 
 void PermissionDispatcher::stopListening(WebPermissionObserver* observer) {
   UnregisterObserver(observer);
 }
 
 void PermissionDispatcher::QueryPermissionForWorker(
     blink::WebPermissionType type,
     const std::string& origin,
     blink::WebPermissionCallback* callback,
@@ skipping 29 matching lines @@
     blink::WebPermissionType type,
     const std::string& origin,
     int worker_thread_id,
     const base::Callback<void(blink::WebPermissionStatus)>& callback) {
   GetPermissionServicePtr()->GetNextPermissionChange(
       GetPermissionName(type), origin,
       // We initialize with an arbitrary value because the mojo service wants a
       // value. Worst case, the observer will get notified about a non-change
       // which should be a no-op. After the first notification,
       // GetNextPermissionChange will be called with the latest known value.
-      mojom::PermissionStatus::ASK,
+      PermissionStatus::ASK,
       base::Bind(&PermissionDispatcher::OnPermissionChangedForWorker,
                  base::Unretained(this), worker_thread_id, callback));
 }
 
 void PermissionDispatcher::GetNextPermissionChangeForWorker(
     blink::WebPermissionType type,
     const std::string& origin,
     blink::WebPermissionStatus status,
     int worker_thread_id,
     const base::Callback<void(blink::WebPermissionStatus)>& callback) {
@@ skipping 13 matching lines @@
     blink::WebPermissionStatus status) {
   callback->onSuccess(status);
 }
 
 void PermissionDispatcher::RunPermissionsCallbackOnWorkerThread(
     scoped_ptr<blink::WebPermissionsCallback> callback,
     scoped_ptr<blink::WebVector<blink::WebPermissionStatus>> statuses) {
   callback->onSuccess(blink::adoptWebPtr(statuses.release()));
 }
 
-mojom::PermissionServicePtr& PermissionDispatcher::GetPermissionServicePtr() {
+blink::mojom::PermissionService*
+PermissionDispatcher::GetPermissionServicePtr() {
   if (!permission_service_.get()) {
     service_registry_->ConnectToRemoteService(
         mojo::GetProxy(&permission_service_));
   }
-  return permission_service_;
+  return permission_service_.get();
 }
 
 void PermissionDispatcher::QueryPermissionInternal(
     blink::WebPermissionType type,
     const std::string& origin,
     blink::WebPermissionCallback* callback,
     int worker_thread_id) {
   // We need to save the |callback| in an ScopedPtrHashMap so if |this| gets
   // deleted, the callback will not leak. In the case of |this| gets deleted,
   // the |permission_service_| pipe will be destroyed too so OnQueryPermission
@@ skipping 39 matching lines @@
     blink::WebPermissionsCallback* callback,
     int worker_thread_id) {
   // We need to save the |callback| in an ScopedVector so if |this| gets
   // deleted, the callback will not leak. In the case of |this| gets deleted,
   // the |permission_service_| pipe will be destroyed too so OnQueryPermission
   // will not be called.
   uintptr_t callback_key = reinterpret_cast<uintptr_t>(callback);
   permissions_callbacks_.add(callback_key,
       scoped_ptr<blink::WebPermissionsCallback>(callback));
 
-  mojo::Array<mojom::PermissionName> names(types.size());
+  mojo::Array<PermissionName> names(types.size());
   for (size_t i = 0; i < types.size(); ++i)
     names[i] = GetPermissionName(types[i]);
 
   GetPermissionServicePtr()->RequestPermissions(
       std::move(names), origin,
       base::Bind(&PermissionDispatcher::OnRequestPermissionsResponse,
                  base::Unretained(this), worker_thread_id, callback_key));
 }
 
 void PermissionDispatcher::RevokePermissionInternal(
@@ skipping 11 matching lines @@
 
   GetPermissionServicePtr()->RevokePermission(
       GetPermissionName(type),
       origin,
       base::Bind(&PermissionDispatcher::OnPermissionResponse,
                  base::Unretained(this),
                  worker_thread_id,
                  callback_key));
 }
 
-void PermissionDispatcher::OnPermissionResponse(
-    int worker_thread_id,
-    uintptr_t callback_key,
-    mojom::PermissionStatus result) {
+void PermissionDispatcher::OnPermissionResponse(int worker_thread_id,
+                                                uintptr_t callback_key,
+                                                PermissionStatus result) {
   scoped_ptr<blink::WebPermissionCallback> callback =
       permission_callbacks_.take_and_erase(callback_key);
   blink::WebPermissionStatus status = GetWebPermissionStatus(result);
 
   if (worker_thread_id != kNoWorkerThread) {
     // If the worker is no longer running, ::PostTask() will return false and
     // gracefully fail, destroying the callback too.
     WorkerThread::PostTask(
         worker_thread_id,
         base::Bind(&PermissionDispatcher::RunPermissionCallbackOnWorkerThread,
                    base::Passed(&callback), status));
     return;
   }
 
   callback->onSuccess(status);
 }
 
 void PermissionDispatcher::OnRequestPermissionsResponse(
     int worker_thread_id,
     uintptr_t callback_key,
-    const mojo::Array<mojom::PermissionStatus>& result) {
+    const mojo::Array<PermissionStatus>& result) {
   scoped_ptr<blink::WebPermissionsCallback> callback =
       permissions_callbacks_.take_and_erase(callback_key);
   scoped_ptr<blink::WebVector<blink::WebPermissionStatus>> statuses(
       new blink::WebVector<blink::WebPermissionStatus>(result.size()));
 
   for (size_t i = 0; i < result.size(); i++)
     statuses->operator[](i) = GetWebPermissionStatus(result[i]);
 
   if (worker_thread_id != kNoWorkerThread) {
     // If the worker is no longer running, ::PostTask() will return false and
     // gracefully fail, destroying the callback too.
     WorkerThread::PostTask(
         worker_thread_id,
         base::Bind(&PermissionDispatcher::RunPermissionsCallbackOnWorkerThread,
                    base::Passed(&callback), base::Passed(&statuses)));
     return;
   }
 
   callback->onSuccess(blink::adoptWebPtr(statuses.release()));
 }
 
 void PermissionDispatcher::OnPermissionChanged(blink::WebPermissionType type,
                                                const std::string& origin,
                                                WebPermissionObserver* observer,
-                                               mojom::PermissionStatus status) {
+                                               PermissionStatus status) {
   if (!IsObserverRegistered(observer))
     return;
 
   observer->permissionChanged(type, GetWebPermissionStatus(status));
 
   GetNextPermissionChange(type, origin, observer, status);
 }
 
 void PermissionDispatcher::OnPermissionChangedForWorker(
     int worker_thread_id,
     const base::Callback<void(blink::WebPermissionStatus)>& callback,
-    mojom::PermissionStatus status) {
+    PermissionStatus status) {
   DCHECK(worker_thread_id != kNoWorkerThread);
 
   WorkerThread::PostTask(worker_thread_id,
                          base::Bind(callback, GetWebPermissionStatus(status)));
 }
 
 void PermissionDispatcher::GetNextPermissionChange(
     blink::WebPermissionType type,
     const std::string& origin,
     WebPermissionObserver* observer,
-    mojom::PermissionStatus current_status) {
+    PermissionStatus current_status) {
   GetPermissionServicePtr()->GetNextPermissionChange(
       GetPermissionName(type),
       origin,
       current_status,
       base::Bind(&PermissionDispatcher::OnPermissionChanged,
                  base::Unretained(this),
                  type,
                  origin,
                  base::Unretained(observer)));
 }
 
 }  // namespace content