Remove OwnPtr::release() calls in platform/ (part 1).

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

 /*
  * Copyright (C) 2012 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 67 matching lines @@
     RefPtr<ImageFrameGenerator> m_generator;
     int m_decodersDestroyed;
 };
 
 TEST_F(ImageDecodingStoreTest, insertDecoder)
 {
     const SkISize size = SkISize::Make(1, 1);
     OwnPtr<ImageDecoder> decoder = MockImageDecoder::create(this);
     decoder->setSize(1, 1);
     const ImageDecoder* refDecoder = decoder.get();
-    ImageDecodingStore::instance().insertDecoder(m_generator.get(), decoder.release());
+    ImageDecodingStore::instance().insertDecoder(m_generator.get(), std::move(decoder));
     EXPECT_EQ(1, ImageDecodingStore::instance().cacheEntries());
     EXPECT_EQ(4u, ImageDecodingStore::instance().memoryUsageInBytes());
 
     ImageDecoder* testDecoder;
     EXPECT_TRUE(ImageDecodingStore::instance().lockDecoder(m_generator.get(), size, &testDecoder));
     EXPECT_TRUE(testDecoder);
     EXPECT_EQ(refDecoder, testDecoder);
     ImageDecodingStore::instance().unlockDecoder(m_generator.get(), testDecoder);
     EXPECT_EQ(1, ImageDecodingStore::instance().cacheEntries());
 }
 
 TEST_F(ImageDecodingStoreTest, evictDecoder)
 {
     OwnPtr<ImageDecoder> decoder1 = MockImageDecoder::create(this);
     OwnPtr<ImageDecoder> decoder2 = MockImageDecoder::create(this);
     OwnPtr<ImageDecoder> decoder3 = MockImageDecoder::create(this);
     decoder1->setSize(1, 1);
     decoder2->setSize(2, 2);
     decoder3->setSize(3, 3);
-    ImageDecodingStore::instance().insertDecoder(m_generator.get(), decoder1.release());
-    ImageDecodingStore::instance().insertDecoder(m_generator.get(), decoder2.release());
-    ImageDecodingStore::instance().insertDecoder(m_generator.get(), decoder3.release());
+    ImageDecodingStore::instance().insertDecoder(m_generator.get(), std::move(decoder1));
+    ImageDecodingStore::instance().insertDecoder(m_generator.get(), std::move(decoder2));
+    ImageDecodingStore::instance().insertDecoder(m_generator.get(), std::move(decoder3));
     EXPECT_EQ(3, ImageDecodingStore::instance().cacheEntries());
     EXPECT_EQ(56u, ImageDecodingStore::instance().memoryUsageInBytes());
 
     evictOneCache();
     EXPECT_EQ(2, ImageDecodingStore::instance().cacheEntries());
     EXPECT_EQ(52u, ImageDecodingStore::instance().memoryUsageInBytes());
 
     evictOneCache();
     EXPECT_EQ(1, ImageDecodingStore::instance().cacheEntries());
     EXPECT_EQ(36u, ImageDecodingStore::instance().memoryUsageInBytes());
 
     evictOneCache();
     EXPECT_FALSE(ImageDecodingStore::instance().cacheEntries());
     EXPECT_FALSE(ImageDecodingStore::instance().memoryUsageInBytes());
 }
 
 TEST_F(ImageDecodingStoreTest, decoderInUseNotEvicted)
 {
     OwnPtr<ImageDecoder> decoder1 = MockImageDecoder::create(this);
     OwnPtr<ImageDecoder> decoder2 = MockImageDecoder::create(this);
     OwnPtr<ImageDecoder> decoder3 = MockImageDecoder::create(this);
     decoder1->setSize(1, 1);
     decoder2->setSize(2, 2);
     decoder3->setSize(3, 3);
-    ImageDecodingStore::instance().insertDecoder(m_generator.get(), decoder1.release());
-    ImageDecodingStore::instance().insertDecoder(m_generator.get(), decoder2.release());
-    ImageDecodingStore::instance().insertDecoder(m_generator.get(), decoder3.release());
+    ImageDecodingStore::instance().insertDecoder(m_generator.get(), std::move(decoder1));
+    ImageDecodingStore::instance().insertDecoder(m_generator.get(), std::move(decoder2));
+    ImageDecodingStore::instance().insertDecoder(m_generator.get(), std::move(decoder3));
     EXPECT_EQ(3, ImageDecodingStore::instance().cacheEntries());
 
     ImageDecoder* testDecoder;
     EXPECT_TRUE(ImageDecodingStore::instance().lockDecoder(m_generator.get(), SkISize::Make(2, 2), &testDecoder));
 
     evictOneCache();
     evictOneCache();
     evictOneCache();
     EXPECT_EQ(1, ImageDecodingStore::instance().cacheEntries());
     EXPECT_EQ(16u, ImageDecodingStore::instance().memoryUsageInBytes());
 
     ImageDecodingStore::instance().unlockDecoder(m_generator.get(), testDecoder);
     evictOneCache();
     EXPECT_FALSE(ImageDecodingStore::instance().cacheEntries());
     EXPECT_FALSE(ImageDecodingStore::instance().memoryUsageInBytes());
 }
 
 TEST_F(ImageDecodingStoreTest, removeDecoder)
 {
     const SkISize size = SkISize::Make(1, 1);
     OwnPtr<ImageDecoder> decoder = MockImageDecoder::create(this);
     decoder->setSize(1, 1);
     const ImageDecoder* refDecoder = decoder.get();
-    ImageDecodingStore::instance().insertDecoder(m_generator.get(), decoder.release());
+    ImageDecodingStore::instance().insertDecoder(m_generator.get(), std::move(decoder));
     EXPECT_EQ(1, ImageDecodingStore::instance().cacheEntries());
     EXPECT_EQ(4u, ImageDecodingStore::instance().memoryUsageInBytes());
 
     ImageDecoder* testDecoder;
     EXPECT_TRUE(ImageDecodingStore::instance().lockDecoder(m_generator.get(), size, &testDecoder));
     EXPECT_TRUE(testDecoder);
     EXPECT_EQ(refDecoder, testDecoder);
     ImageDecodingStore::instance().removeDecoder(m_generator.get(), testDecoder);
     EXPECT_FALSE(ImageDecodingStore::instance().cacheEntries());
 
     EXPECT_FALSE(ImageDecodingStore::instance().lockDecoder(m_generator.get(), size, &testDecoder));
 }
 
 } // namespace blink