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

Unified Diff: chrome/browser/ui/toolbar/media_router_action_unittest.cc

Issue 2410553002: Show Media Router toolbar icon ephemerally for MR dialogs (Closed)
Patch Set: DISALLOW_COPY_AND_ASSIGN MockMediaRouterActionController 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/toolbar/media_router_action_unittest.cc
diff --git a/chrome/browser/ui/toolbar/media_router_action_unittest.cc b/chrome/browser/ui/toolbar/media_router_action_unittest.cc
index 39a97042c6616b73e832c50c741b8688956c85cf..c85cc323c6de45853534bde100ccc7d0122ee06b 100644
--- a/chrome/browser/ui/toolbar/media_router_action_unittest.cc
+++ b/chrome/browser/ui/toolbar/media_router_action_unittest.cc
@@ -10,7 +10,7 @@
#include "chrome/browser/ui/toolbar/media_router_action.h"
#include "chrome/browser/ui/toolbar/toolbar_action_view_delegate.h"
#include "chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl.h"
-#include "chrome/browser/ui/webui/media_router/media_router_test.h"
+#include "chrome/browser/ui/webui/media_router/media_router_web_ui_test.h"
#include "chrome/grit/generated_resources.h"
#include "content/public/browser/site_instance.h"
#include "content/public/test/test_utils.h"
@@ -76,10 +76,11 @@ class TestMediaRouterAction : public MediaRouterAction {
MediaRouterActionPlatformDelegate* platform_delegate_;
};
-class MediaRouterActionUnitTest : public MediaRouterTest {
+class MediaRouterActionUnitTest : public MediaRouterWebUITest {
public:
MediaRouterActionUnitTest()
- : toolbar_model_(nullptr),
+ : MediaRouterWebUITest(true),
+ toolbar_model_(nullptr),
fake_issue_notification_(media_router::Issue(
"title notification",
"message notification",
@@ -117,9 +118,9 @@ class MediaRouterActionUnitTest : public MediaRouterTest {
~MediaRouterActionUnitTest() override {}
- // MediaRouterTest:
+ // MediaRouterWebUITest:
void SetUp() override {
- MediaRouterTest::SetUp();
+ MediaRouterWebUITest::SetUp();
toolbar_model_ =
extensions::extension_action_test_util::CreateToolbarModelForProfile(
profile());
@@ -147,7 +148,7 @@ class MediaRouterActionUnitTest : public MediaRouterTest {
void TearDown() override {
action_.reset();
browser_action_test_util_.reset();
- MediaRouterTest::TearDown();
+ MediaRouterWebUITest::TearDown();
}
gfx::Image GetIcon(gfx::VectorIconId icon_id) {

Powered by Google App Engine
This is Rietveld 408576698