content/test/image_decoder_test.cc - Issue 1874903002: Convert //content from scoped_ptr to std::unique_ptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/test/image_decoder_test.cc

Issue 1874903002: Convert //content from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 8 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

« no previous file with comments | « content/test/fake_renderer_scheduler.cc ('k') | content/test/layouttest_support.cc » ('j') | extensions/shell/browser/shell_url_request_context_getter.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/test/image_decoder_test.cc

diff --git a/content/test/image_decoder_test.cc b/content/test/image_decoder_test.cc

index f7ce4bf9430b625b3214e09bfd65df86a3823c35..751f9789aff7e69ddf7a03169b02f01f72ecf526 100644

--- a/content/test/image_decoder_test.cc

+++ b/content/test/image_decoder_test.cc

@@ -6,11 +6,12 @@

#include <stddef.h>

+#include <memory>

#include "base/files/file_enumerator.h"

#include "base/files/file_path.h"

#include "base/files/file_util.h"

#include "base/md5.h"

-#include "base/memory/scoped_ptr.h"

#include "base/path_service.h"

#include "base/strings/pattern.h"

#include "base/strings/string_util.h"

@@ -177,7 +178,7 @@ void ImageDecoderTest::TestWebKitImageDecoder(

std::vector<char> image_contents;

ReadFileToVector(image_path, &image_contents);

EXPECT_TRUE(image_contents.size());

- scoped_ptr<blink::WebImageDecoder> decoder(CreateWebKitImageDecoder());

+ std::unique_ptr<blink::WebImageDecoder> decoder(CreateWebKitImageDecoder());

EXPECT_FALSE(decoder->isFailed());

#if !defined(CALCULATE_MD5_SUMS)