Index: ash/display/root_window_transformers_unittest.cc |
diff --git a/ash/display/root_window_transformers_unittest.cc b/ash/display/root_window_transformers_unittest.cc |
index 01dab0ee8917c21de070ace2ef7c8488cd1d0162..1c93f196313215e59355fdd80ac786a773818236 100644 |
--- a/ash/display/root_window_transformers_unittest.cc |
+++ b/ash/display/root_window_transformers_unittest.cc |
@@ -4,6 +4,8 @@ |
#include "ash/display/root_window_transformers.h" |
+#include <memory> |
+ |
#include "ash/display/display_info.h" |
#include "ash/display/display_manager.h" |
#include "ash/display/display_util.h" |
@@ -115,7 +117,7 @@ float GetStoredUIScale(int64_t id) { |
GetEffectiveUIScale(); |
} |
-scoped_ptr<RootWindowTransformer> |
+std::unique_ptr<RootWindowTransformer> |
CreateCurrentRootWindowTransformerForMirroring() { |
DisplayManager* display_manager = Shell::GetInstance()->display_manager(); |
DCHECK(display_manager->IsInMirrorMode()); |
@@ -123,7 +125,7 @@ CreateCurrentRootWindowTransformerForMirroring() { |
display_manager->GetDisplayInfo(display_manager->mirroring_display_id()); |
const DisplayInfo& source_display_info = display_manager->GetDisplayInfo( |
gfx::Screen::GetScreen()->GetPrimaryDisplay().id()); |
- return scoped_ptr<RootWindowTransformer>( |
+ return std::unique_ptr<RootWindowTransformer>( |
CreateRootWindowTransformerForMirroredDisplay(source_display_info, |
mirror_display_info)); |
} |
@@ -409,7 +411,7 @@ TEST_F(RootWindowTransformersTest, LetterBoxPillarBox) { |
DisplayManager* display_manager = Shell::GetInstance()->display_manager(); |
display_manager->SetMultiDisplayMode(DisplayManager::MIRRORING); |
UpdateDisplay("400x200,500x500"); |
- scoped_ptr<RootWindowTransformer> transformer( |
+ std::unique_ptr<RootWindowTransformer> transformer( |
CreateCurrentRootWindowTransformerForMirroring()); |
// Y margin must be margin is (500 - 500/400 * 200) / 2 = 125. |
EXPECT_EQ("0,125,0,125", transformer->GetHostInsets().ToString()); |