bluetooth: Refactor Bluetooth and Stub out BluetoothInteraction.

Source/modules/bluetooth/Bluetooth.h

Index: Source/modules/bluetooth/Bluetooth.h
diff --git a/Source/modules/bluetooth/Bluetooth.h b/Source/modules/bluetooth/Bluetooth.h
index 9a42358a79791906d22d5b354a0173cec3d87fd3..a00ee4e4a516e10ef91ee7cc9fd4154cd9abc596 100644
--- a/Source/modules/bluetooth/Bluetooth.h
+++ b/Source/modules/bluetooth/Bluetooth.h
@@ -5,19 +5,40 @@
 #ifndef Bluetooth_h
 #define Bluetooth_h
 
+#include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptWrappable.h"
 #include "modules/bluetooth/BluetoothDiscovery.h"
+#include "modules/bluetooth/BluetoothInteraction.h"
+#include "platform/heap/Handle.h"
 
 namespace blink {
 
-class Bluetooth final
-    : public BluetoothDiscovery {
+class ScriptPromise;
+class ScriptState;
+
+class Bluetooth
+    : public GarbageCollected<Bluetooth>
+    , public ScriptWrappable {
     DEFINE_WRAPPERTYPEINFO();
 public:
     static Bluetooth* create()
     {
         return new Bluetooth();
     }
+
+    // BluetoothDiscovery interface
+    ScriptPromise requestDevice(ScriptState*);
+
+    DEFINE_INLINE_TRACE()
+    {
+        visitor->trace(m_bluetoothDiscovery);
+        visitor->trace(m_bluetoothInteraction);
+    }
+private:
+    Member<BluetoothDiscovery> m_bluetoothDiscovery;

[scheib, 2015/04/25 04:01:01]

I think these can be direct members, not requiring additional objects to be
allocated and garbage collected. See
https://www.chromium.org/blink/blink-gc#TOC-Part-classes

[ortuno, 2015/04/27 22:22:01]

Done.

+    Member<BluetoothInteraction> m_bluetoothInteraction;
+    BluetoothDiscovery* bluetoothDiscovery();
+
 };
 
 } // namespace blink