Index: content/browser/compositor/software_output_device_ozone_unittest.cc |
diff --git a/content/browser/compositor/software_output_device_ozone_unittest.cc b/content/browser/compositor/software_output_device_ozone_unittest.cc |
index 71c8bd941e5bb9540a97f62cf63c14be562ab95f..8ff6181f229829b24128913d5a07c6cc786c8a09 100644 |
--- a/content/browser/compositor/software_output_device_ozone_unittest.cc |
+++ b/content/browser/compositor/software_output_device_ozone_unittest.cc |
@@ -2,11 +2,13 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
+#include "content/browser/compositor/software_output_device_ozone.h" |
+ |
+#include <memory> |
+ |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/message_loop/message_loop.h" |
#include "base/thread_task_runner_handle.h" |
-#include "content/browser/compositor/software_output_device_ozone.h" |
#include "testing/gtest/include/gtest/gtest.h" |
#include "third_party/skia/include/core/SkCanvas.h" |
#include "ui/compositor/compositor.h" |
@@ -63,14 +65,14 @@ class SoftwareOutputDeviceOzoneTest : public testing::Test { |
void TearDown() override; |
protected: |
- scoped_ptr<content::SoftwareOutputDeviceOzone> output_device_; |
+ std::unique_ptr<content::SoftwareOutputDeviceOzone> output_device_; |
bool enable_pixel_output_; |
private: |
- scoped_ptr<ui::Compositor> compositor_; |
- scoped_ptr<base::MessageLoop> message_loop_; |
+ std::unique_ptr<ui::Compositor> compositor_; |
+ std::unique_ptr<base::MessageLoop> message_loop_; |
TestPlatformWindowDelegate window_delegate_; |
- scoped_ptr<ui::PlatformWindow> window_; |
+ std::unique_ptr<ui::PlatformWindow> window_; |
DISALLOW_COPY_AND_ASSIGN(SoftwareOutputDeviceOzoneTest); |
}; |