Merge //content/child/permissions into Blink's permissions module.

third_party/WebKit/Source/modules/permissions/PermissionStatus.h

Index: third_party/WebKit/Source/modules/permissions/PermissionStatus.h
diff --git a/third_party/WebKit/Source/modules/permissions/PermissionStatus.h b/third_party/WebKit/Source/modules/permissions/PermissionStatus.h
index 8d1b1e05abd06f64f413198f326d08ec87c75ca9..e6bd6e214a8bf907161d8061d0ded9583dbd2f01 100644
--- a/third_party/WebKit/Source/modules/permissions/PermissionStatus.h
+++ b/third_party/WebKit/Source/modules/permissions/PermissionStatus.h
@@ -9,9 +9,7 @@
 #include "core/dom/ActiveDOMObject.h"
 #include "core/events/EventTarget.h"
 #include "platform/heap/Handle.h"
-#include "public/platform/modules/permissions/WebPermissionObserver.h"
-#include "public/platform/modules/permissions/WebPermissionStatus.h"
-#include "public/platform/modules/permissions/WebPermissionType.h"
+#include "public/platform/modules/permissions/permission.mojom-blink.h"
 #include "wtf/text/AtomicString.h"
 #include "wtf/text/WTFString.h"
 
@@ -25,23 +23,19 @@ class ScriptPromiseResolver;
 class PermissionStatus final
     : public EventTargetWithInlineData
     , public ActiveScriptWrappable
-    , public ActiveDOMObject
-    , public WebPermissionObserver {
+    , public ActiveDOMObject {
     USING_GARBAGE_COLLECTED_MIXIN(PermissionStatus);
     DEFINE_WRAPPERTYPEINFO();
 public:
-    static PermissionStatus* take(ScriptPromiseResolver*, WebPermissionStatus, WebPermissionType);
+    static PermissionStatus* take(ScriptPromiseResolver*, mojom::blink::PermissionStatus, mojom::blink::PermissionName);
 
-    static PermissionStatus* createAndListen(ExecutionContext*, WebPermissionStatus, WebPermissionType);
+    static PermissionStatus* createAndListen(ExecutionContext*, mojom::blink::PermissionStatus, mojom::blink::PermissionName);
     ~PermissionStatus() override;
 
     // EventTarget implementation.
     const AtomicString& interfaceName() const override;
     ExecutionContext* getExecutionContext() const override;
 
-    // WebPermissionObserver implementation.
-    void permissionChanged(WebPermissionType, WebPermissionStatus) override;
-
     // ActiveScriptWrappable implementation.
     bool hasPendingActivity() const final;
 
@@ -51,20 +45,21 @@ public:
     void stop() override;
 
     String state() const;
+    void permissionChanged(mojom::blink::PermissionStatus);
 
     DEFINE_ATTRIBUTE_EVENT_LISTENER(change);
 
     DECLARE_VIRTUAL_TRACE();
 
 private:
-    PermissionStatus(ExecutionContext*, WebPermissionStatus, WebPermissionType);
+    PermissionStatus(ExecutionContext*, mojom::blink::PermissionStatus, mojom::blink::PermissionName);
 
     void startListening();
     void stopListening();
 
-    WebPermissionStatus m_status;
-    WebPermissionType m_type;
-    bool m_listening;
+    mojom::blink::PermissionStatus m_status;
+    mojom::blink::PermissionName m_name;
+    mojom::blink::PermissionServicePtr m_service;

[mlamouri (slow - plz ping), 2016/07/18 10:25:57]

nit: you could add some `using` statements inside the class block. Not super
important but would help reduce the size of these types :)

[Reilly Grant (use Gerrit), 2016/07/19 20:10:28]

Done.

 };
 
 } // namespace blink