| Index: components/mus/demo/mus_demo.cc
|
| diff --git a/components/mus/demo/mus_demo.cc b/components/mus/demo/mus_demo.cc
|
| index 32a23ff361bddb3527d8c94344d32943864cb723..56dd3d45fdd7a8597f0e59a232a62b40b0765f93 100644
|
| --- a/components/mus/demo/mus_demo.cc
|
| +++ b/components/mus/demo/mus_demo.cc
|
| @@ -98,7 +98,7 @@ bool MusDemo::OnWmSetBounds(mus::Window* window, gfx::Rect* bounds) {
|
|
|
| bool MusDemo::OnWmSetProperty(mus::Window* window,
|
| const std::string& name,
|
| - scoped_ptr<std::vector<uint8_t>>* new_data) {
|
| + std::unique_ptr<std::vector<uint8_t>>* new_data) {
|
| return true;
|
| }
|
|
|
| @@ -147,7 +147,7 @@ void MusDemo::DrawFrame() {
|
| const unsigned char* addr =
|
| static_cast<const unsigned char*>(bitmap_.getPixels());
|
| const int bytes = bounds.width() * bounds.height() * 4;
|
| - scoped_ptr<std::vector<unsigned char>> data(
|
| + std::unique_ptr<std::vector<unsigned char>> data(
|
| new std::vector<unsigned char>(addr, addr + bytes));
|
| bitmap_.unlockPixels();
|
|
|
|
|