Index: Source/modules/permissions/NavigatorPermissions.cpp |
diff --git a/Source/modules/permissions/NavigatorPermissions.cpp b/Source/modules/permissions/NavigatorPermissions.cpp |
index eb35ebb55e69bec4f3ea9219d196ea23f508132f..1741bb5ba2e2ee2cf3fddf05178168cde9920ba2 100644 |
--- a/Source/modules/permissions/NavigatorPermissions.cpp |
+++ b/Source/modules/permissions/NavigatorPermissions.cpp |
@@ -14,10 +14,6 @@ NavigatorPermissions::NavigatorPermissions() |
{ |
} |
-NavigatorPermissions::~NavigatorPermissions() |
-{ |
-} |
- |
// static |
const char* NavigatorPermissions::supplementName() |
{ |
@@ -27,10 +23,10 @@ const char* NavigatorPermissions::supplementName() |
// static |
NavigatorPermissions& NavigatorPermissions::from(Navigator& navigator) |
{ |
- NavigatorPermissions* supplement = static_cast<NavigatorPermissions*>(WillBeHeapSupplement<Navigator>::from(navigator, supplementName())); |
+ NavigatorPermissions* supplement = static_cast<NavigatorPermissions*>(HeapSupplement<Navigator>::from(navigator, supplementName())); |
if (!supplement) { |
supplement = new NavigatorPermissions(); |
- provideTo(navigator, supplementName(), adoptPtrWillBeNoop(supplement)); |
+ provideTo(navigator, supplementName(), supplement); |
} |
return *supplement; |
} |
@@ -47,7 +43,7 @@ Permissions* NavigatorPermissions::permissions(Navigator& navigator) |
DEFINE_TRACE(NavigatorPermissions) |
{ |
visitor->trace(m_permissions); |
- WillBeHeapSupplement<Navigator>::trace(visitor); |
+ HeapSupplement<Navigator>::trace(visitor); |
} |
} // namespace blink |