Make Resource RefCountedWillBeGarbageCollectedFinalized, attempt #2

third_party/WebKit/Source/core/css/CSSStyleSheetResourceTest.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/fetch/CSSStyleSheetResource.h"
 
 #include "core/css/CSSCrossfadeValue.h"
 #include "core/css/CSSImageValue.h"
 #include "core/css/CSSPrimitiveValue.h"
 #include "core/css/CSSProperty.h"
@@ skipping 53 matching lines @@
 {
     {
         // We need this scope to remove all references.
         KURL imageURL(KURL(), "https://localhost/image");
         KURL cssURL(KURL(), "https://localhost/style.css");
 
         // We need to disable loading because we manually give a response to
         // the image resource.
         document()->fetcher()->setAutoLoadImages(false);
 
-        ResourcePtr<CSSStyleSheetResource> cssResource = CSSStyleSheetResource::createForTest(ResourceRequest(cssURL), "utf-8");
+        RefPtrWillBeRawPtr<CSSStyleSheetResource> cssResource = CSSStyleSheetResource::createForTest(ResourceRequest(cssURL), "utf-8");
         memoryCache()->add(cssResource.get());
         cssResource->responseReceived(ResourceResponse(cssURL, "style/css", 0, nullAtom, String()), nullptr);
         cssResource->finish();
 
         RefPtrWillBeRawPtr<StyleSheetContents> contents = StyleSheetContents::create(CSSParserContext(HTMLStandardMode, nullptr));
         RefPtrWillBeRawPtr<CSSStyleSheet> sheet = CSSStyleSheet::create(contents, document());
         EXPECT_TRUE(sheet);
         RefPtrWillBeRawPtr<CSSCrossfadeValue> crossfade = CSSCrossfadeValue::create(
             CSSImageValue::create(String("image"), imageURL),
             CSSImageValue::create(String("image"), imageURL),
             CSSPrimitiveValue::create(1.0, CSSPrimitiveValue::UnitType::Number));
         Vector<OwnPtr<CSSParserSelector>> selectors;
         selectors.append(adoptPtr(new CSSParserSelector()));
         selectors[0]->setMatch(CSSSelector::Id);
         selectors[0]->setValue("foo");
         CSSProperty property(CSSPropertyBackground, crossfade);
         contents->parserAppendRule(
             StyleRule::create(CSSSelectorList::adoptSelectorVector(selectors), ImmutableStylePropertySet::create(&property, 1, HTMLStandardMode)));
 
         crossfade->loadSubimages(document());
-        ResourcePtr<Resource> imageResource = memoryCache()->resourceForURL(imageURL, MemoryCache::defaultCacheIdentifier());
+        RefPtrWillBeRawPtr<Resource> imageResource = memoryCache()->resourceForURL(imageURL, MemoryCache::defaultCacheIdentifier());
         ASSERT_TRUE(imageResource);
         ResourceResponse imageResponse;
         imageResponse.setURL(imageURL);
         imageResponse.setHTTPHeaderField("cache-control", "no-store");
         imageResource->responseReceived(imageResponse, nullptr);
 
         contents->checkLoaded();
         cssResource->saveParsedStyleSheet(contents);
 
         memoryCache()->update(cssResource.get(), cssResource->size(), cssResource->size(), false);
         memoryCache()->update(imageResource.get(), imageResource->size(), imageResource->size(), false);
         if (!memoryCache()->isInSameLRUListForTest(cssResource.get(), imageResource.get())) {
             // We assume that the LRU list is determined by |size / accessCount|.
             for (size_t i = 0; i < cssResource->size() + 1; ++i)
                 memoryCache()->update(cssResource.get(), cssResource->size(), cssResource->size(), true);
             for (size_t i = 0; i < imageResource->size() + 1; ++i)
                 memoryCache()->update(imageResource.get(), imageResource->size(), imageResource->size(), true);
         }
         ASSERT_TRUE(memoryCache()->isInSameLRUListForTest(cssResource.get(), imageResource.get()));
     }
     Heap::collectAllGarbage();
     // This operation should not lead to crash!
     memoryCache()->pruneAll();
 }
 
 } // namespace
 } // namespace blink