Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(547)

Unified Diff: ui/display/chromeos/display_configurator_unittest.cc

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/display/chromeos/display_configurator.cc ('k') | ui/display/chromeos/display_snapshot_virtual.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/display/chromeos/display_configurator_unittest.cc
diff --git a/ui/display/chromeos/display_configurator_unittest.cc b/ui/display/chromeos/display_configurator_unittest.cc
index 4cf8fadf92689e46778bbf969ffe8cc0eb80ae66..9a9dc73b9f6e31a6ea2b2f99240fd5b2fc6bb905 100644
--- a/ui/display/chromeos/display_configurator_unittest.cc
+++ b/ui/display/chromeos/display_configurator_unittest.cc
@@ -142,7 +142,7 @@ class DisplayConfiguratorTest : public testing::Test {
native_display_delegate_ = new TestNativeDisplayDelegate(log_.get());
configurator_.SetDelegateForTesting(
- scoped_ptr<NativeDisplayDelegate>(native_display_delegate_));
+ std::unique_ptr<NativeDisplayDelegate>(native_display_delegate_));
configurator_.set_state_controller(&state_controller_);
configurator_.set_mirroring_controller(&mirroring_controller_);
@@ -245,7 +245,7 @@ class DisplayConfiguratorTest : public testing::Test {
TestMirroringController mirroring_controller_;
DisplayConfigurator configurator_;
TestObserver observer_;
- scoped_ptr<ActionLogger> log_;
+ std::unique_ptr<ActionLogger> log_;
TestNativeDisplayDelegate* native_display_delegate_; // not owned
DisplayConfigurator::TestApi test_api_;
« no previous file with comments | « ui/display/chromeos/display_configurator.cc ('k') | ui/display/chromeos/display_snapshot_virtual.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698