Oilpan: Remove most WillBe types from the code base

third_party/WebKit/Source/platform/graphics/BitmapImageTest.cpp

 /*
  * 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 24 matching lines @@
 #include "platform/graphics/DeferredImageDecoder.h"
 #include "platform/graphics/ImageObserver.h"
 #include "platform/testing/HistogramTester.h"
 #include "platform/testing/UnitTestHelpers.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace blink {
 
 class BitmapImageTest : public ::testing::Test {
 public:
-    class FakeImageObserver : public NoBaseWillBeGarbageCollectedFinalized<FakeImageObserver>, public ImageObserver {
-        WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(FakeImageObserver);
+    class FakeImageObserver : public GarbageCollectedFinalized<FakeImageObserver>, public ImageObserver {
+        USING_GARBAGE_COLLECTED_MIXIN(FakeImageObserver);
     public:
         FakeImageObserver() : m_lastDecodedSizeChangedDelta(0) { }
 
         virtual void decodedSizeChanged(const Image*, int delta)
         {
             m_lastDecodedSizeChangedDelta = delta;
         }
         void didDraw(const Image*) override { }
         bool shouldPauseAnimation(const Image*) override { return false; }
         void animationAdvanced(const Image*) override { }
@@ skipping 76 matching lines @@
     }
 
 protected:
     void SetUp() override
     {
         DeferredImageDecoder::setEnabled(m_enableDeferredDecoding);
         m_imageObserver = adoptPtrWillBeNoop(new FakeImageObserver);
         m_image = BitmapImage::create(m_imageObserver.get());
     }
 
-    OwnPtrWillBePersistent<FakeImageObserver> m_imageObserver;
+    Persistent<FakeImageObserver> m_imageObserver;
     RefPtr<BitmapImage> m_image;
 
 private:
     bool m_enableDeferredDecoding;
 };
 
 TEST_F(BitmapImageTest, destroyDecodedDataExceptCurrentFrame)
 {
     loadImage("/LayoutTests/fast/images/resources/animated-10color.gif");
     size_t totalSize = decodedSize();
@@ skipping 214 matching lines @@
     {"/LayoutTests/fast/images/resources/exif-orientation-5-lu.jpg", OriginLeftTop},
     {"/LayoutTests/fast/images/resources/exif-orientation-6-ru.jpg", OriginRightTop},
     {"/LayoutTests/fast/images/resources/exif-orientation-7-rl.jpg", OriginRightBottom},
     {"/LayoutTests/fast/images/resources/exif-orientation-8-llo.jpg", OriginLeftBottom}
 };
 
 INSTANTIATE_TEST_CASE_P(DecodedImageOrientationHistogramTest, DecodedImageOrientationHistogramTest,
     ::testing::ValuesIn(kDecodedImageOrientationHistogramTestParams));
 
 } // namespace blink