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

content/test/mock_permission_manager.h

Index: content/test/mock_permission_manager.h
diff --git a/content/test/mock_permission_manager.h b/content/test/mock_permission_manager.h
index c6f19047d829daff2b3550779181d2bf6b1b42b9..d9151b9d96577d1c012ef573eb1f32f4adbc83f2 100644
--- a/content/test/mock_permission_manager.h
+++ b/content/test/mock_permission_manager.h
@@ -24,20 +24,22 @@ class MockPermissionManager : public PermissionManager {
 
   // PermissionManager:
   MOCK_METHOD3(GetPermissionStatus,
-               mojom::PermissionStatus(PermissionType permission,
-                                       const GURL& requesting_origin,
-                                       const GURL& embedding_origin));
+               blink::mojom::PermissionStatus(PermissionType permission,
+                                              const GURL& requesting_origin,
+                                              const GURL& embedding_origin));
   int RequestPermission(
       PermissionType permission,
       RenderFrameHost* render_frame_host,
       const GURL& requesting_origin,
-      const base::Callback<void(mojom::PermissionStatus)>& callback) override;
+      const base::Callback<void(blink::mojom::PermissionStatus)>& callback)
+      override;
   int RequestPermissions(
       const std::vector<PermissionType>& permission,
       RenderFrameHost* render_frame_host,
       const GURL& requesting_origin,
-      const base::Callback<void(const std::vector<mojom::PermissionStatus>&)>&
-          callback) override;
+      const base::Callback<
+          void(const std::vector<blink::mojom::PermissionStatus>&)>& callback)
+      override;
   void CancelPermissionRequest(int request_id) override {}
   void ResetPermission(PermissionType permission,
                        const GURL& requesting_origin,
@@ -49,7 +51,8 @@ class MockPermissionManager : public PermissionManager {
       PermissionType permission,
       const GURL& requesting_origin,
       const GURL& embedding_origin,
-      const base::Callback<void(mojom::PermissionStatus)>& callback) override;
+      const base::Callback<void(blink::mojom::PermissionStatus)>& callback)
+      override;
   void UnsubscribePermissionStatusChange(int subscription_id) override {}
 
  private: