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

Unified Diff: chrome/browser/media/router/media_router_dialog_controller_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
« no previous file with comments | « no previous file | chrome/browser/media/router/media_router_ui_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/media/router/media_router_dialog_controller_unittest.cc
diff --git a/chrome/browser/media/router/media_router_dialog_controller_unittest.cc b/chrome/browser/media/router/media_router_dialog_controller_unittest.cc
index 5aef99fe785ee1d519978a87108e35c2a7c93579..44dbeb578ede3bd22e2a92d899524a0bf82c37a7 100644
--- a/chrome/browser/media/router/media_router_dialog_controller_unittest.cc
+++ b/chrome/browser/media/router/media_router_dialog_controller_unittest.cc
@@ -7,6 +7,7 @@
#include "chrome/browser/media/router/create_presentation_connection_request.h"
#include "chrome/browser/media/router/media_router_dialog_controller.h"
#include "chrome/browser/profiles/profile.h"
+#include "chrome/common/features.h"
#include "chrome/test/base/chrome_render_view_host_test_harness.h"
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/web_contents.h"
@@ -78,11 +79,15 @@ class MediaRouterDialogControllerTest : public ChromeRenderViewHostTestHarness {
std::unique_ptr<MockWebContentsDelegate> web_contents_delegate_;
};
+#if BUILDFLAG(ANDROID_JAVA_UI)
+// The non-Android implementation is tested in
+// MediaRouterDialogControllerImplTest.
TEST_F(MediaRouterDialogControllerTest, CreateForWebContents) {
MediaRouterDialogController* dialog_controller =
MediaRouterDialogController::GetOrCreateForWebContents(web_contents());
ASSERT_NE(dialog_controller, nullptr);
}
+#endif
TEST_F(MediaRouterDialogControllerTest, ShowAndHideDialog) {
EXPECT_CALL(*web_contents_delegate_, ActivateContents(web_contents()));
« no previous file with comments | « no previous file | chrome/browser/media/router/media_router_ui_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698