Oilpan: dispose ServiceWorker (and registration) objects earlier.

Source/platform/heap/ThreadState.h

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 143 matching lines @@
         static bool invokePreFinalizer(void* object, Visitor& visitor)   \
         { \
             Class* self = reinterpret_cast<Class*>(object); \
             if (visitor.isAlive(self)) \
                 return false; \
             self->method(); \
             return true; \
         } \
         using UsingPreFinazlizerMacroNeedsTrailingSemiColon = char
 
+#if ENABLE(OILPAN)
+#define WILL_BE_USING_PRE_FINALIZER(Class, method) USING_PRE_FINALIZER(Class, method)
+#else
+#define WILL_BE_USING_PRE_FINALIZER(Class, method)
+#endif
+
 // List of typed heaps. The list is used to generate the implementation
 // of typed heap related methods.
 //
 // To create a new typed heap add a H(<ClassName>) to the
 // FOR_EACH_TYPED_HEAP macro below.
 #define FOR_EACH_TYPED_HEAP(H)              \
     H(Node)                                 \
     H(RenderObject)                         \
     H(CSSValue)
 
@@ skipping 545 matching lines @@
         m_locked = false;
     }
 
     MutexBase& m_mutex;
     bool m_locked;
 };
 
 } // namespace blink
 
 #endif // ThreadState_h