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

Side by Side Diff: ash/window_user_data_unittest.cc

Issue 2847283002: chromeos: convert remaining AshTest usage to AshTestBase (Closed)
Patch Set: Created 3 years, 7 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/window_user_data.h" 5 #include "ash/window_user_data.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "ash/test/ash_test.h" 9 #include "ash/test/ash_test_base.h"
10 #include "ash/window_user_data.h" 10 #include "ash/window_user_data.h"
11 #include "base/memory/ptr_util.h" 11 #include "base/memory/ptr_util.h"
12 #include "ui/aura/window.h" 12 #include "ui/aura/window.h"
13 #include "ui/compositor/layer_type.h" 13 #include "ui/compositor/layer_type.h"
14 14
15 namespace ash { 15 namespace ash {
16 namespace { 16 namespace {
17 17
18 // Class that sets a bool* to true from the destructor. Used to track 18 // Class that sets a bool* to true from the destructor. Used to track
19 // destruction. 19 // destruction.
20 class Data { 20 class Data {
21 public: 21 public:
22 explicit Data(bool* delete_setter) : delete_setter_(delete_setter) {} 22 explicit Data(bool* delete_setter) : delete_setter_(delete_setter) {}
23 ~Data() { *delete_setter_ = true; } 23 ~Data() { *delete_setter_ = true; }
24 24
25 private: 25 private:
26 bool* delete_setter_; 26 bool* delete_setter_;
27 27
28 DISALLOW_COPY_AND_ASSIGN(Data); 28 DISALLOW_COPY_AND_ASSIGN(Data);
29 }; 29 };
30 30
31 } // namespace 31 } // namespace
32 32
33 using WindowUserDataTest = AshTest; 33 using WindowUserDataTest = test::AshTestBase;
34 34
35 // Verifies clear() deletes the data associated with a window. 35 // Verifies clear() deletes the data associated with a window.
36 TEST_F(WindowUserDataTest, ClearDestroys) { 36 TEST_F(WindowUserDataTest, ClearDestroys) {
37 WindowUserData<Data> user_data; 37 WindowUserData<Data> user_data;
38 aura::Window window(nullptr, ui::wm::WINDOW_TYPE_UNKNOWN); 38 aura::Window window(nullptr, ui::wm::WINDOW_TYPE_UNKNOWN);
39 window.Init(ui::LAYER_NOT_DRAWN); 39 window.Init(ui::LAYER_NOT_DRAWN);
40 bool data_deleted = false; 40 bool data_deleted = false;
41 user_data.Set(&window, base::MakeUnique<Data>(&data_deleted)); 41 user_data.Set(&window, base::MakeUnique<Data>(&data_deleted));
42 EXPECT_FALSE(data_deleted); 42 EXPECT_FALSE(data_deleted);
43 user_data.clear(); 43 user_data.clear();
(...skipping 27 matching lines...) Expand all
71 window.Init(ui::LAYER_NOT_DRAWN); 71 window.Init(ui::LAYER_NOT_DRAWN);
72 bool data1_deleted = false; 72 bool data1_deleted = false;
73 user_data.Set(&window, base::MakeUnique<Data>(&data1_deleted)); 73 user_data.Set(&window, base::MakeUnique<Data>(&data1_deleted));
74 EXPECT_FALSE(data1_deleted); 74 EXPECT_FALSE(data1_deleted);
75 user_data.Set(&window, nullptr); 75 user_data.Set(&window, nullptr);
76 EXPECT_TRUE(data1_deleted); 76 EXPECT_TRUE(data1_deleted);
77 EXPECT_TRUE(user_data.GetWindows().empty()); 77 EXPECT_TRUE(user_data.GetWindows().empty());
78 } 78 }
79 79
80 } // namespace ash 80 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698