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

Side by Side Diff: ui/message_center/message_center_tray_unittest.cc

Issue 12375004: Re-home the global MessageCenter to support Ash+Win environments. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Merge master. Created 7 years, 9 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 | « ui/message_center/message_center.cc ('k') | ui/message_center/message_center_util.cc » ('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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 "ui/message_center/message_center_tray.h" 5 #include "ui/message_center/message_center_tray.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "testing/gtest/include/gtest/gtest.h" 8 #include "testing/gtest/include/gtest/gtest.h"
9 #include "ui/message_center/message_center.h" 9 #include "ui/message_center/message_center.h"
10 #include "ui/message_center/notification_types.h" 10 #include "ui/message_center/notification_types.h"
(...skipping 25 matching lines...) Expand all
36 private: 36 private:
37 DISALLOW_COPY_AND_ASSIGN(MockDelegate); 37 DISALLOW_COPY_AND_ASSIGN(MockDelegate);
38 }; 38 };
39 39
40 class MessageCenterTrayTest : public testing::Test { 40 class MessageCenterTrayTest : public testing::Test {
41 public: 41 public:
42 MessageCenterTrayTest() {} 42 MessageCenterTrayTest() {}
43 virtual ~MessageCenterTrayTest() {} 43 virtual ~MessageCenterTrayTest() {}
44 44
45 virtual void SetUp() { 45 virtual void SetUp() {
46 MessageCenter::Initialize();
46 delegate_.reset(new MockDelegate); 47 delegate_.reset(new MockDelegate);
47 message_center_.reset(new MessageCenter()); 48 message_center_ = MessageCenter::Get();
48 message_center_tray_.reset( 49 message_center_tray_.reset(
49 new MessageCenterTray(delegate_.get(), message_center_.get())); 50 new MessageCenterTray(delegate_.get(), message_center_));
50 } 51 }
51 52
52 virtual void TearDown() { 53 virtual void TearDown() {
53 message_center_tray_.reset(); 54 message_center_tray_.reset();
54 message_center_.reset();
55 delegate_.reset(); 55 delegate_.reset();
56 message_center_ = NULL;
57 MessageCenter::Shutdown();
56 } 58 }
57 59
58 protected: 60 protected:
59 scoped_ptr<MockDelegate> delegate_; 61 scoped_ptr<MockDelegate> delegate_;
60 scoped_ptr<MessageCenterTray> message_center_tray_; 62 scoped_ptr<MessageCenterTray> message_center_tray_;
61 scoped_ptr<MessageCenter> message_center_; 63 MessageCenter* message_center_;
62 64
63 private: 65 private:
64 DISALLOW_COPY_AND_ASSIGN(MessageCenterTrayTest); 66 DISALLOW_COPY_AND_ASSIGN(MessageCenterTrayTest);
65 }; 67 };
66 68
67 } // namespace 69 } // namespace
68 70
69 TEST_F(MessageCenterTrayTest, BasicMessageCenter) { 71 TEST_F(MessageCenterTrayTest, BasicMessageCenter) {
70 ASSERT_FALSE(message_center_tray_->popups_visible()); 72 ASSERT_FALSE(message_center_tray_->popups_visible());
71 ASSERT_FALSE(message_center_tray_->message_center_visible()); 73 ASSERT_FALSE(message_center_tray_->message_center_visible());
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 ASSERT_FALSE(message_center_tray_->popups_visible()); 201 ASSERT_FALSE(message_center_tray_->popups_visible());
200 ASSERT_FALSE(message_center_tray_->message_center_visible()); 202 ASSERT_FALSE(message_center_tray_->message_center_visible());
201 203
202 message_center_tray_->HidePopupBubble(); 204 message_center_tray_->HidePopupBubble();
203 205
204 ASSERT_FALSE(message_center_tray_->popups_visible()); 206 ASSERT_FALSE(message_center_tray_->popups_visible());
205 ASSERT_FALSE(message_center_tray_->message_center_visible()); 207 ASSERT_FALSE(message_center_tray_->message_center_visible());
206 } 208 }
207 209
208 } // namespace message_center 210 } // namespace message_center
OLDNEW
« no previous file with comments | « ui/message_center/message_center.cc ('k') | ui/message_center/message_center_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698