| Index: chrome/utility/cloud_print/pwg_encoder_unittest.cc
|
| diff --git a/chrome/utility/cloud_print/pwg_encoder_unittest.cc b/chrome/utility/cloud_print/pwg_encoder_unittest.cc
|
| index a60b6f43ac4e08c1cfb08476eab5c2378889cd96..8264ed04513d5d6067bb61ee7aefc6c7990afd57 100644
|
| --- a/chrome/utility/cloud_print/pwg_encoder_unittest.cc
|
| +++ b/chrome/utility/cloud_print/pwg_encoder_unittest.cc
|
| @@ -2,13 +2,15 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| +#include "chrome/utility/cloud_print/pwg_encoder.h"
|
| +
|
| #include <stdint.h>
|
|
|
| +#include <memory>
|
| +
|
| #include "base/files/file_util.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/sha1.h"
|
| #include "chrome/utility/cloud_print/bitmap_image.h"
|
| -#include "chrome/utility/cloud_print/pwg_encoder.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| namespace cloud_print {
|
| @@ -26,10 +28,9 @@ const int kRasterWidth = 612;
|
| const int kRasterHeight = 792;
|
| const int kRasterDPI = 72;
|
|
|
| -scoped_ptr<BitmapImage> MakeSampleBitmap() {
|
| - scoped_ptr<BitmapImage> bitmap_image(
|
| - new BitmapImage(gfx::Size(kRasterWidth, kRasterHeight),
|
| - BitmapImage::RGBA));
|
| +std::unique_ptr<BitmapImage> MakeSampleBitmap() {
|
| + std::unique_ptr<BitmapImage> bitmap_image(new BitmapImage(
|
| + gfx::Size(kRasterWidth, kRasterHeight), BitmapImage::RGBA));
|
|
|
| uint32_t* bitmap_data =
|
| reinterpret_cast<uint32_t*>(bitmap_image->pixel_data());
|
| @@ -67,7 +68,7 @@ scoped_ptr<BitmapImage> MakeSampleBitmap() {
|
| TEST(PwgRasterTest, CompareWithMaster) {
|
| std::string output;
|
| PwgEncoder encoder;
|
| - scoped_ptr<BitmapImage> image = MakeSampleBitmap();
|
| + std::unique_ptr<BitmapImage> image = MakeSampleBitmap();
|
| PwgHeaderInfo header_info;
|
| header_info.dpi = kRasterDPI;
|
| header_info.total_pages = 1;
|
|
|