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

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: Addressed comments Created 4 years, 1 month 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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 74
75 MediaRouterDialogControllerImpl* controller_; 75 MediaRouterDialogControllerImpl* controller_;
76 MediaRouterActionPlatformDelegate* platform_delegate_; 76 MediaRouterActionPlatformDelegate* platform_delegate_;
77 }; 77 };
78 78
79 class MediaRouterActionUnitTest : public MediaRouterWebUITest { 79 class MediaRouterActionUnitTest : public MediaRouterWebUITest {
80 public: 80 public:
81 MediaRouterActionUnitTest() 81 MediaRouterActionUnitTest()
82 : MediaRouterWebUITest(true), 82 : MediaRouterWebUITest(true),
83 toolbar_model_(nullptr), 83 toolbar_model_(nullptr),
84 fake_issue_notification_(media_router::Issue( 84 fake_issue_notification_(media_router::IssueInfo(
85 "title notification", 85 "title notification",
86 "message notification", 86 media_router::IssueInfo::Action::DISMISS,
87 media_router::IssueAction(media_router::IssueAction::TYPE_DISMISS), 87 media_router::IssueInfo::Severity::NOTIFICATION)),
88 std::vector<media_router::IssueAction>(), 88 fake_issue_warning_(media_router::IssueInfo(
89 "route_id", 89 "title warning",
90 media_router::Issue::NOTIFICATION, 90 media_router::IssueInfo::Action::LEARN_MORE,
91 false, 91 media_router::IssueInfo::Severity::WARNING)),
92 -1)), 92 fake_issue_fatal_(
93 fake_issue_warning_( 93 media_router::IssueInfo("title fatal",
94 media_router::Issue("title warning", 94 media_router::IssueInfo::Action::DISMISS,
95 "message warning", 95 media_router::IssueInfo::Severity::FATAL)),
96 media_router::IssueAction(
97 media_router::IssueAction::TYPE_LEARN_MORE),
98 std::vector<media_router::IssueAction>(),
99 "route_id",
100 media_router::Issue::WARNING,
101 false,
102 12345)),
103 fake_issue_fatal_(media_router::Issue(
104 "title fatal",
105 "message fatal",
106 media_router::IssueAction(media_router::IssueAction::TYPE_DISMISS),
107 std::vector<media_router::IssueAction>(),
108 "route_id",
109 media_router::Issue::FATAL,
110 true,
111 -1)),
112 fake_source1_("fakeSource1"), 96 fake_source1_("fakeSource1"),
113 fake_source2_("fakeSource2"), 97 fake_source2_("fakeSource2"),
114 active_icon_(GetIcon(gfx::VectorIconId::MEDIA_ROUTER_ACTIVE)), 98 active_icon_(GetIcon(gfx::VectorIconId::MEDIA_ROUTER_ACTIVE)),
115 error_icon_(GetIcon(gfx::VectorIconId::MEDIA_ROUTER_ERROR)), 99 error_icon_(GetIcon(gfx::VectorIconId::MEDIA_ROUTER_ERROR)),
116 idle_icon_(GetIcon(gfx::VectorIconId::MEDIA_ROUTER_IDLE)), 100 idle_icon_(GetIcon(gfx::VectorIconId::MEDIA_ROUTER_IDLE)),
117 warning_icon_(GetIcon(gfx::VectorIconId::MEDIA_ROUTER_WARNING)) {} 101 warning_icon_(GetIcon(gfx::VectorIconId::MEDIA_ROUTER_WARNING)) {}
118 102
119 ~MediaRouterActionUnitTest() override {} 103 ~MediaRouterActionUnitTest() override {}
120 104
121 // MediaRouterWebUITest: 105 // MediaRouterWebUITest:
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
363 EXPECT_CALL(*mock_delegate, OnPopupClosed()).Times(1); 347 EXPECT_CALL(*mock_delegate, OnPopupClosed()).Times(1);
364 action()->ExecuteAction(true); 348 action()->ExecuteAction(true);
365 EXPECT_FALSE(dialog_controller->IsShowingMediaRouterDialog()); 349 EXPECT_FALSE(dialog_controller->IsShowingMediaRouterDialog());
366 350
367 EXPECT_CALL(*mock_delegate, OnPopupShown(true)).Times(1); 351 EXPECT_CALL(*mock_delegate, OnPopupShown(true)).Times(1);
368 dialog_controller->CreateMediaRouterDialog(); 352 dialog_controller->CreateMediaRouterDialog();
369 353
370 EXPECT_CALL(*mock_delegate, OnPopupClosed()).Times(1); 354 EXPECT_CALL(*mock_delegate, OnPopupClosed()).Times(1);
371 dialog_controller->HideMediaRouterDialog(); 355 dialog_controller->HideMediaRouterDialog();
372 } 356 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698