Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(845)

Unified Diff: third_party/WebKit/Source/platform/graphics/ImageDecodingStoreTest.cpp

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/graphics/ImageDecodingStoreTest.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/ImageDecodingStoreTest.cpp b/third_party/WebKit/Source/platform/graphics/ImageDecodingStoreTest.cpp
index 809174a14c901ccf6f029e17a5c84db1d0dc2d78..bbd4fbe579125039c341d403a0a996be906fa67a 100644
--- a/third_party/WebKit/Source/platform/graphics/ImageDecodingStoreTest.cpp
+++ b/third_party/WebKit/Source/platform/graphics/ImageDecodingStoreTest.cpp
@@ -28,6 +28,7 @@
#include "platform/graphics/ImageFrameGenerator.h"
#include "platform/graphics/test/MockImageDecoder.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include <memory>
namespace blink {
@@ -82,7 +83,7 @@ protected:
TEST_F(ImageDecodingStoreTest, insertDecoder)
{
const SkISize size = SkISize::Make(1, 1);
- OwnPtr<ImageDecoder> decoder = MockImageDecoder::create(this);
+ std::unique_ptr<ImageDecoder> decoder = MockImageDecoder::create(this);
decoder->setSize(1, 1);
const ImageDecoder* refDecoder = decoder.get();
ImageDecodingStore::instance().insertDecoder(m_generator.get(), std::move(decoder));
@@ -99,9 +100,9 @@ TEST_F(ImageDecodingStoreTest, insertDecoder)
TEST_F(ImageDecodingStoreTest, evictDecoder)
{
- OwnPtr<ImageDecoder> decoder1 = MockImageDecoder::create(this);
- OwnPtr<ImageDecoder> decoder2 = MockImageDecoder::create(this);
- OwnPtr<ImageDecoder> decoder3 = MockImageDecoder::create(this);
+ std::unique_ptr<ImageDecoder> decoder1 = MockImageDecoder::create(this);
+ std::unique_ptr<ImageDecoder> decoder2 = MockImageDecoder::create(this);
+ std::unique_ptr<ImageDecoder> decoder3 = MockImageDecoder::create(this);
decoder1->setSize(1, 1);
decoder2->setSize(2, 2);
decoder3->setSize(3, 3);
@@ -126,9 +127,9 @@ TEST_F(ImageDecodingStoreTest, evictDecoder)
TEST_F(ImageDecodingStoreTest, decoderInUseNotEvicted)
{
- OwnPtr<ImageDecoder> decoder1 = MockImageDecoder::create(this);
- OwnPtr<ImageDecoder> decoder2 = MockImageDecoder::create(this);
- OwnPtr<ImageDecoder> decoder3 = MockImageDecoder::create(this);
+ std::unique_ptr<ImageDecoder> decoder1 = MockImageDecoder::create(this);
+ std::unique_ptr<ImageDecoder> decoder2 = MockImageDecoder::create(this);
+ std::unique_ptr<ImageDecoder> decoder3 = MockImageDecoder::create(this);
decoder1->setSize(1, 1);
decoder2->setSize(2, 2);
decoder3->setSize(3, 3);
@@ -155,7 +156,7 @@ TEST_F(ImageDecodingStoreTest, decoderInUseNotEvicted)
TEST_F(ImageDecodingStoreTest, removeDecoder)
{
const SkISize size = SkISize::Make(1, 1);
- OwnPtr<ImageDecoder> decoder = MockImageDecoder::create(this);
+ std::unique_ptr<ImageDecoder> decoder = MockImageDecoder::create(this);
decoder->setSize(1, 1);
const ImageDecoder* refDecoder = decoder.get();
ImageDecodingStore::instance().insertDecoder(m_generator.get(), std::move(decoder));

Powered by Google App Engine
This is Rietveld 408576698