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

Side by Side Diff: ash/first_run/first_run_helper_unittest.cc

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/first_run/first_run_helper.h" 5 #include "ash/first_run/first_run_helper.h"
6 6
7 #include "ash/first_run/desktop_cleaner.h" 7 #include "ash/first_run/desktop_cleaner.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/shell_window_ids.h" 9 #include "ash/shell_window_ids.h"
10 #include "ash/test/ash_test_base.h" 10 #include "ash/test/ash_test_base.h"
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 } 99 }
100 100
101 FirstRunHelper* helper() { return helper_.get(); } 101 FirstRunHelper* helper() { return helper_.get(); }
102 102
103 int cancelled_times() const { return cancelled_times_; } 103 int cancelled_times() const { return cancelled_times_; }
104 104
105 private: 105 private:
106 // FirstRunHelper::Observer overrides. 106 // FirstRunHelper::Observer overrides.
107 void OnCancelled() override { ++cancelled_times_; } 107 void OnCancelled() override { ++cancelled_times_; }
108 108
109 scoped_ptr<FirstRunHelper> helper_; 109 std::unique_ptr<FirstRunHelper> helper_;
110 int cancelled_times_; 110 int cancelled_times_;
111 111
112 DISALLOW_COPY_AND_ASSIGN(FirstRunHelperTest); 112 DISALLOW_COPY_AND_ASSIGN(FirstRunHelperTest);
113 }; 113 };
114 114
115 // This test creates helper, checks that containers are hidden and then 115 // This test creates helper, checks that containers are hidden and then
116 // destructs helper. 116 // destructs helper.
117 TEST_F(FirstRunHelperTest, ContainersAreHidden) { 117 TEST_F(FirstRunHelperTest, ContainersAreHidden) {
118 CheckContainersAreHidden(); 118 CheckContainersAreHidden();
119 } 119 }
(...skipping 17 matching lines...) Expand all
137 CountingEventHandler handler(&mouse_events); 137 CountingEventHandler handler(&mouse_events);
138 overlay_window->AddPreTargetHandler(&handler); 138 overlay_window->AddPreTargetHandler(&handler);
139 GetEventGenerator().PressLeftButton(); 139 GetEventGenerator().PressLeftButton();
140 GetEventGenerator().ReleaseLeftButton(); 140 GetEventGenerator().ReleaseLeftButton();
141 EXPECT_EQ(mouse_events, 2); 141 EXPECT_EQ(mouse_events, 2);
142 overlay_window->RemovePreTargetHandler(&handler); 142 overlay_window->RemovePreTargetHandler(&handler);
143 } 143 }
144 144
145 } // namespace test 145 } // namespace test
146 } // namespace ash 146 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698