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

Side by Side Diff: components/mus/ws/server_window_drawn_tracker_unittest.cc

Issue 1906623003: Convert //components/mus 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
« no previous file with comments | « components/mus/ws/server_window_delegate.h ('k') | components/mus/ws/server_window_surface.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "components/mus/ws/server_window_drawn_tracker.h" 5 #include "components/mus/ws/server_window_drawn_tracker.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "components/mus/ws/server_window.h" 10 #include "components/mus/ws/server_window.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 const ServerWindow* window_; 56 const ServerWindow* window_;
57 bool is_drawn_; 57 bool is_drawn_;
58 58
59 DISALLOW_COPY_AND_ASSIGN(TestServerWindowDrawnTrackerObserver); 59 DISALLOW_COPY_AND_ASSIGN(TestServerWindowDrawnTrackerObserver);
60 }; 60 };
61 61
62 } // namespace 62 } // namespace
63 63
64 TEST(ServerWindowDrawnTrackerTest, ChangeBecauseOfDeletionAndVisibility) { 64 TEST(ServerWindowDrawnTrackerTest, ChangeBecauseOfDeletionAndVisibility) {
65 TestServerWindowDelegate server_window_delegate; 65 TestServerWindowDelegate server_window_delegate;
66 scoped_ptr<ServerWindow> window( 66 std::unique_ptr<ServerWindow> window(
67 new ServerWindow(&server_window_delegate, WindowId())); 67 new ServerWindow(&server_window_delegate, WindowId()));
68 server_window_delegate.set_root_window(window.get()); 68 server_window_delegate.set_root_window(window.get());
69 TestServerWindowDrawnTrackerObserver drawn_observer; 69 TestServerWindowDrawnTrackerObserver drawn_observer;
70 ServerWindowDrawnTracker tracker(window.get(), &drawn_observer); 70 ServerWindowDrawnTracker tracker(window.get(), &drawn_observer);
71 window->SetVisible(true); 71 window->SetVisible(true);
72 EXPECT_EQ(1u, drawn_observer.change_count()); 72 EXPECT_EQ(1u, drawn_observer.change_count());
73 EXPECT_EQ(window.get(), drawn_observer.window()); 73 EXPECT_EQ(window.get(), drawn_observer.window());
74 EXPECT_EQ(nullptr, drawn_observer.ancestor()); 74 EXPECT_EQ(nullptr, drawn_observer.ancestor());
75 EXPECT_TRUE(drawn_observer.is_drawn()); 75 EXPECT_TRUE(drawn_observer.is_drawn());
76 drawn_observer.clear_change_count(); 76 drawn_observer.clear_change_count();
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 EXPECT_EQ(1u, drawn_observer.change_count()); 226 EXPECT_EQ(1u, drawn_observer.change_count());
227 EXPECT_EQ(&child111, drawn_observer.window()); 227 EXPECT_EQ(&child111, drawn_observer.window());
228 EXPECT_EQ(nullptr, drawn_observer.ancestor()); 228 EXPECT_EQ(nullptr, drawn_observer.ancestor());
229 EXPECT_TRUE(drawn_observer.is_drawn()); 229 EXPECT_TRUE(drawn_observer.is_drawn());
230 EXPECT_TRUE(child111.IsDrawn()); 230 EXPECT_TRUE(child111.IsDrawn());
231 } 231 }
232 232
233 } // namespace ws 233 } // namespace ws
234 234
235 } // namespace mus 235 } // namespace mus
OLDNEW
« no previous file with comments | « components/mus/ws/server_window_delegate.h ('k') | components/mus/ws/server_window_surface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698