| Index: chrome/browser/ui/tests/ui_gfx_image_unittest.cc
|
| diff --git a/chrome/browser/ui/tests/ui_gfx_image_unittest.cc b/chrome/browser/ui/tests/ui_gfx_image_unittest.cc
|
| index c226cc1abf8028e64fcc7174fe4c4d4b5b109ff8..99d24e45ae22b32bfcc3bc0b6909d72078a2dc12 100644
|
| --- a/chrome/browser/ui/tests/ui_gfx_image_unittest.cc
|
| +++ b/chrome/browser/ui/tests/ui_gfx_image_unittest.cc
|
| @@ -2,7 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| +#include <memory>
|
| +
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| #include "third_party/skia/include/core/SkBitmap.h"
|
| #include "ui/gfx/image/image.h"
|
| @@ -19,11 +20,11 @@ namespace {
|
| TEST(UiGfxImageTest, ViewsImageView) {
|
| gfx::Image image(gfx::test::CreatePlatformImage());
|
|
|
| - scoped_ptr<views::View> container(new views::View());
|
| + std::unique_ptr<views::View> container(new views::View());
|
| container->SetBounds(0, 0, 200, 200);
|
| container->SetVisible(true);
|
|
|
| - scoped_ptr<views::ImageView> image_view(new views::ImageView());
|
| + std::unique_ptr<views::ImageView> image_view(new views::ImageView());
|
| image_view->SetImage(*image.ToImageSkia());
|
| container->AddChildView(image_view.get());
|
| }
|
|
|