Index: Source/modules/bluetooth/NavigatorBluetooth.cpp |
diff --git a/Source/modules/bluetooth/NavigatorBluetooth.cpp b/Source/modules/bluetooth/NavigatorBluetooth.cpp |
index 5aaa699f151d83510d43ef3fd8887e2ade5ec169..743979165b8aed34e050345f3f8557236702ba7b 100644 |
--- a/Source/modules/bluetooth/NavigatorBluetooth.cpp |
+++ b/Source/modules/bluetooth/NavigatorBluetooth.cpp |
@@ -12,10 +12,10 @@ namespace blink { |
NavigatorBluetooth& NavigatorBluetooth::from(Navigator& navigator) |
{ |
- NavigatorBluetooth* supplement = static_cast<NavigatorBluetooth*>(WillBeHeapSupplement<Navigator>::from(navigator, supplementName())); |
+ NavigatorBluetooth* supplement = static_cast<NavigatorBluetooth*>(HeapSupplement<Navigator>::from(navigator, supplementName())); |
if (!supplement) { |
supplement = new NavigatorBluetooth(); |
- provideTo(navigator, supplementName(), adoptPtrWillBeNoop(supplement)); |
+ provideTo(navigator, supplementName(), supplement); |
} |
return *supplement; |
} |
@@ -35,15 +35,13 @@ Bluetooth* NavigatorBluetooth::bluetooth() |
DEFINE_TRACE(NavigatorBluetooth) |
{ |
visitor->trace(m_bluetooth); |
- WillBeHeapSupplement<Navigator>::trace(visitor); |
+ HeapSupplement<Navigator>::trace(visitor); |
} |
NavigatorBluetooth::NavigatorBluetooth() |
{ |
} |
-DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(NavigatorBluetooth); |
- |
const char* NavigatorBluetooth::supplementName() |
{ |
return "NavigatorBluetooth"; |