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

Side by Side Diff: chrome/browser/ui/toolbar/media_router_action_unittest.cc

Issue 2176613003: [Media Router] Clean up issues related code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: IssueObserver init behavior and use StructTraits Created 4 years, 2 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 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 "base/macros.h" 5 #include "base/macros.h"
6 #include "chrome/browser/extensions/browser_action_test_util.h" 6 #include "chrome/browser/extensions/browser_action_test_util.h"
7 #include "chrome/browser/extensions/extension_action_test_util.h" 7 #include "chrome/browser/extensions/extension_action_test_util.h"
8 #include "chrome/browser/ui/browser_commands.h" 8 #include "chrome/browser/ui/browser_commands.h"
9 #include "chrome/browser/ui/tabs/tab_strip_model.h" 9 #include "chrome/browser/ui/tabs/tab_strip_model.h"
10 #include "chrome/browser/ui/toolbar/media_router_action.h" 10 #include "chrome/browser/ui/toolbar/media_router_action.h"
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 } 73 }
74 74
75 MediaRouterDialogControllerImpl* controller_; 75 MediaRouterDialogControllerImpl* controller_;
76 MediaRouterActionPlatformDelegate* platform_delegate_; 76 MediaRouterActionPlatformDelegate* platform_delegate_;
77 }; 77 };
78 78
79 class MediaRouterActionUnitTest : public MediaRouterTest { 79 class MediaRouterActionUnitTest : public MediaRouterTest {
80 public: 80 public:
81 MediaRouterActionUnitTest() 81 MediaRouterActionUnitTest()
82 : toolbar_model_(nullptr), 82 : toolbar_model_(nullptr),
83 fake_issue_notification_(media_router::Issue( 83 fake_issue_notification_(media_router::IssueInfo(
84 "title notification", 84 "title notification",
85 "message notification", 85 media_router::IssueInfo::Action::DISMISS,
86 media_router::IssueAction(media_router::IssueAction::TYPE_DISMISS), 86 media_router::IssueInfo::Severity::NOTIFICATION)),
87 std::vector<media_router::IssueAction>(), 87 fake_issue_warning_(media_router::IssueInfo(
88 "route_id", 88 "title warning",
89 media_router::Issue::NOTIFICATION, 89 media_router::IssueInfo::Action::LEARN_MORE,
90 false, 90 media_router::IssueInfo::Severity::WARNING)),
91 -1)), 91 fake_issue_fatal_(
92 fake_issue_warning_( 92 media_router::IssueInfo("title fatal",
93 media_router::Issue("title warning", 93 media_router::IssueInfo::Action::DISMISS,
94 "message warning", 94 media_router::IssueInfo::Severity::FATAL)),
95 media_router::IssueAction(
96 media_router::IssueAction::TYPE_LEARN_MORE),
97 std::vector<media_router::IssueAction>(),
98 "route_id",
99 media_router::Issue::WARNING,
100 false,
101 12345)),
102 fake_issue_fatal_(media_router::Issue(
103 "title fatal",
104 "message fatal",
105 media_router::IssueAction(media_router::IssueAction::TYPE_DISMISS),
106 std::vector<media_router::IssueAction>(),
107 "route_id",
108 media_router::Issue::FATAL,
109 true,
110 -1)),
111 fake_source1_("fakeSource1"), 95 fake_source1_("fakeSource1"),
112 fake_source2_("fakeSource2"), 96 fake_source2_("fakeSource2"),
113 active_icon_(GetIcon(gfx::VectorIconId::MEDIA_ROUTER_ACTIVE)), 97 active_icon_(GetIcon(gfx::VectorIconId::MEDIA_ROUTER_ACTIVE)),
114 error_icon_(GetIcon(gfx::VectorIconId::MEDIA_ROUTER_ERROR)), 98 error_icon_(GetIcon(gfx::VectorIconId::MEDIA_ROUTER_ERROR)),
115 idle_icon_(GetIcon(gfx::VectorIconId::MEDIA_ROUTER_IDLE)), 99 idle_icon_(GetIcon(gfx::VectorIconId::MEDIA_ROUTER_IDLE)),
116 warning_icon_(GetIcon(gfx::VectorIconId::MEDIA_ROUTER_WARNING)) {} 100 warning_icon_(GetIcon(gfx::VectorIconId::MEDIA_ROUTER_WARNING)) {}
117 101
118 ~MediaRouterActionUnitTest() override {} 102 ~MediaRouterActionUnitTest() override {}
119 103
120 // MediaRouterTest: 104 // MediaRouterTest:
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
362 EXPECT_CALL(*mock_delegate, OnPopupClosed()).Times(1); 346 EXPECT_CALL(*mock_delegate, OnPopupClosed()).Times(1);
363 action()->ExecuteAction(true); 347 action()->ExecuteAction(true);
364 EXPECT_FALSE(dialog_controller->IsShowingMediaRouterDialog()); 348 EXPECT_FALSE(dialog_controller->IsShowingMediaRouterDialog());
365 349
366 EXPECT_CALL(*mock_delegate, OnPopupShown(true)).Times(1); 350 EXPECT_CALL(*mock_delegate, OnPopupShown(true)).Times(1);
367 dialog_controller->CreateMediaRouterDialog(); 351 dialog_controller->CreateMediaRouterDialog();
368 352
369 EXPECT_CALL(*mock_delegate, OnPopupClosed()).Times(1); 353 EXPECT_CALL(*mock_delegate, OnPopupClosed()).Times(1);
370 dialog_controller->HideMediaRouterDialog(); 354 dialog_controller->HideMediaRouterDialog();
371 } 355 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698