Oilpan: Remove WillBe types (part 13)

third_party/WebKit/Source/core/fileapi/FileReader.cpp

 /*
  * Copyright (C) 2010 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 53 matching lines @@
 #endif
 
 } // namespace
 
 // Embedders like chromium limit the number of simultaneous requests to avoid
 // excessive IPC congestion. We limit this to 100 per thread to throttle the
 // requests (the value is arbitrarily chosen).
 static const size_t kMaxOutstandingRequestsPerThread = 100;
 static const double progressNotificationIntervalMS = 50;
 
-class FileReader::ThrottlingController final : public NoBaseWillBeGarbageCollectedFinalized<FileReader::ThrottlingController>, public WillBeHeapSupplement<ExecutionContext> {
-    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(FileReader::ThrottlingController);
+class FileReader::ThrottlingController final : public GarbageCollectedFinalized<FileReader::ThrottlingController>, public HeapSupplement<ExecutionContext> {
+    USING_GARBAGE_COLLECTED_MIXIN(FileReader::ThrottlingController);
 public:
     static ThrottlingController* from(ExecutionContext* context)
     {
         if (!context)
             return 0;
 
-        ThrottlingController* controller = static_cast<ThrottlingController*>(WillBeHeapSupplement<ExecutionContext>::from(*context, supplementName()));
+        ThrottlingController* controller = static_cast<ThrottlingController*>(HeapSupplement<ExecutionContext>::from(*context, supplementName()));
         if (!controller) {
             controller = new ThrottlingController();
-            WillBeHeapSupplement<ExecutionContext>::provideTo(*context, supplementName(), adoptPtrWillBeNoop(controller));
+            HeapSupplement<ExecutionContext>::provideTo(*context, supplementName(), adoptPtrWillBeNoop(controller));
         }
         return controller;
     }
 
     ~ThrottlingController() { }
 
     enum FinishReaderType { DoNotRunPendingReaders, RunPendingReaders };
 
     static void pushReader(ExecutionContext* context, FileReader* reader)
     {
@@ skipping 24 matching lines @@
 
         controller->finishReader(reader, nextStep);
     }
 
     DEFINE_INLINE_TRACE()
     {
 #if ENABLE(OILPAN)
         visitor->trace(m_pendingReaders);
         visitor->trace(m_runningReaders);
 #endif
-        WillBeHeapSupplement<ExecutionContext>::trace(visitor);
+        HeapSupplement<ExecutionContext>::trace(visitor);
     }
 
 private:
     ThrottlingController()
         : m_maxRunningReaders(kMaxOutstandingRequestsPerThread)
     {
     }
 
     void pushReader(FileReader* reader)
     {
@@ skipping 39 matching lines @@
             FileReader* reader = m_pendingReaders.takeFirst();
             reader->executePendingRead();
             m_runningReaders.add(reader);
         }
     }
 
     static const char* supplementName() { return "FileReaderThrottlingController"; }
 
     const size_t m_maxRunningReaders;
 
-    using FileReaderDeque = PersistentHeapDequeWillBeHeapDeque<Member<FileReader>>;
-    using FileReaderHashSet = PersistentHeapHashSetWillBeHeapHashSet<Member<FileReader>>;
+    using FileReaderDeque = HeapDeque<Member<FileReader>>;
+    using FileReaderHashSet = HeapHashSet<Member<FileReader>>;
 
     FileReaderDeque m_pendingReaders;
     FileReaderHashSet m_runningReaders;
 };
 
 FileReader* FileReader::create(ExecutionContext* context)
 {
     FileReader* fileReader = new FileReader(context);
     fileReader->suspendIfNeeded();
     return fileReader;
@@ skipping 267 matching lines @@
 }
 
 DEFINE_TRACE(FileReader)
 {
     visitor->trace(m_error);
     RefCountedGarbageCollectedEventTargetWithInlineData<FileReader>::trace(visitor);
     ActiveDOMObject::trace(visitor);
 }
 
 } // namespace blink