Index: ash/display/display_color_manager_chromeos.cc |
diff --git a/ash/display/display_color_manager_chromeos.cc b/ash/display/display_color_manager_chromeos.cc |
index 278dcb31d8c3fe34e3222ced8e33d43f55a87d54..0f382548f312abec881ad52ecf443eecfce9be27 100644 |
--- a/ash/display/display_color_manager_chromeos.cc |
+++ b/ash/display/display_color_manager_chromeos.cc |
@@ -22,7 +22,7 @@ namespace ash { |
namespace { |
-scoped_ptr<DisplayColorManager::ColorCalibrationData> ParseDisplayProfile( |
+std::unique_ptr<DisplayColorManager::ColorCalibrationData> ParseDisplayProfile( |
const base::FilePath& path, |
bool has_color_correction_matrix) { |
VLOG(1) << "Trying ICC file " << path.value() |
@@ -44,7 +44,7 @@ scoped_ptr<DisplayColorManager::ColorCalibrationData> ParseDisplayProfile( |
return nullptr; |
} |
- scoped_ptr<DisplayColorManager::ColorCalibrationData> data( |
+ std::unique_ptr<DisplayColorManager::ColorCalibrationData> data( |
new DisplayColorManager::ColorCalibrationData()); |
if (vcgt_channel_length) { |
VLOG_IF(1, has_color_correction_matrix) |
@@ -236,7 +236,7 @@ void DisplayColorManager::FinishLoadCalibrationForDisplay( |
void DisplayColorManager::UpdateCalibrationData( |
int64_t display_id, |
int64_t product_id, |
- scoped_ptr<ColorCalibrationData> data) { |
+ std::unique_ptr<ColorCalibrationData> data) { |
DCHECK(thread_checker_.CalledOnValidThread()); |
if (data) { |
// The map takes over ownership of the underlying memory. |