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

Side by Side Diff: chrome/browser/ui/panels/panel_mouse_watcher_unittest.cc

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "base/memory/scoped_ptr.h" 5 #include "chrome/browser/ui/panels/panel_mouse_watcher.h"
6
7 #include <memory>
8
6 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
7 #include "chrome/browser/ui/panels/panel_mouse_watcher.h"
8 #include "chrome/browser/ui/panels/panel_mouse_watcher_observer.h" 10 #include "chrome/browser/ui/panels/panel_mouse_watcher_observer.h"
9 #include "testing/gtest/include/gtest/gtest.h" 11 #include "testing/gtest/include/gtest/gtest.h"
10 #include "ui/gfx/geometry/point.h" 12 #include "ui/gfx/geometry/point.h"
11 13
12 class TestMouseObserver : public PanelMouseWatcherObserver { 14 class TestMouseObserver : public PanelMouseWatcherObserver {
13 public: 15 public:
14 TestMouseObserver() : mouse_movements_(0) {} 16 TestMouseObserver() : mouse_movements_(0) {}
15 // Overridden from PanelMouseWatcherObserver: 17 // Overridden from PanelMouseWatcherObserver:
16 void OnMouseMove(const gfx::Point& mouse_position) override { 18 void OnMouseMove(const gfx::Point& mouse_position) override {
17 ++mouse_movements_; 19 ++mouse_movements_;
18 } 20 }
19 int mouse_movements_; 21 int mouse_movements_;
20 }; 22 };
21 23
22 class PanelMouseWatcherTest : public testing::Test { 24 class PanelMouseWatcherTest : public testing::Test {
23 }; 25 };
24 26
25 TEST_F(PanelMouseWatcherTest, StartStopWatching) { 27 TEST_F(PanelMouseWatcherTest, StartStopWatching) {
26 base::MessageLoopForUI loop; 28 base::MessageLoopForUI loop;
27 29
28 scoped_ptr<PanelMouseWatcher> watcher(PanelMouseWatcher::Create()); 30 std::unique_ptr<PanelMouseWatcher> watcher(PanelMouseWatcher::Create());
29 EXPECT_FALSE(watcher->IsActive()); 31 EXPECT_FALSE(watcher->IsActive());
30 32
31 scoped_ptr<TestMouseObserver> user1(new TestMouseObserver()); 33 std::unique_ptr<TestMouseObserver> user1(new TestMouseObserver());
32 scoped_ptr<TestMouseObserver> user2(new TestMouseObserver()); 34 std::unique_ptr<TestMouseObserver> user2(new TestMouseObserver());
33 35
34 // No observers. 36 // No observers.
35 watcher->NotifyMouseMovement(gfx::Point(42, 101)); 37 watcher->NotifyMouseMovement(gfx::Point(42, 101));
36 EXPECT_EQ(0, user1->mouse_movements_); 38 EXPECT_EQ(0, user1->mouse_movements_);
37 EXPECT_EQ(0, user2->mouse_movements_); 39 EXPECT_EQ(0, user2->mouse_movements_);
38 40
39 // Only one mouse observer. 41 // Only one mouse observer.
40 watcher->AddObserver(user1.get()); 42 watcher->AddObserver(user1.get());
41 EXPECT_TRUE(watcher->IsActive()); 43 EXPECT_TRUE(watcher->IsActive());
42 watcher->NotifyMouseMovement(gfx::Point(42, 101)); 44 watcher->NotifyMouseMovement(gfx::Point(42, 101));
(...skipping 13 matching lines...) Expand all
56 // Back to one observer. 58 // Back to one observer.
57 watcher->RemoveObserver(user1.get()); 59 watcher->RemoveObserver(user1.get());
58 EXPECT_TRUE(watcher->IsActive()); 60 EXPECT_TRUE(watcher->IsActive());
59 int saved_count = user1->mouse_movements_; 61 int saved_count = user1->mouse_movements_;
60 watcher->NotifyMouseMovement(gfx::Point(1, 2)); 62 watcher->NotifyMouseMovement(gfx::Point(1, 2));
61 EXPECT_EQ(saved_count, user1->mouse_movements_); 63 EXPECT_EQ(saved_count, user1->mouse_movements_);
62 EXPECT_GE(user2->mouse_movements_, 2); 64 EXPECT_GE(user2->mouse_movements_, 2);
63 watcher->RemoveObserver(user2.get()); 65 watcher->RemoveObserver(user2.get());
64 EXPECT_FALSE(watcher->IsActive()); 66 EXPECT_FALSE(watcher->IsActive());
65 } 67 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/panels/panel_manager.cc ('k') | chrome/browser/ui/panels/stacked_panel_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698