summaryrefslogtreecommitdiff
path: root/chromium/chrome/browser/ui/webui/media_router/media_router_ui_unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/chrome/browser/ui/webui/media_router/media_router_ui_unittest.cc')
-rw-r--r--chromium/chrome/browser/ui/webui/media_router/media_router_ui_unittest.cc101
1 files changed, 37 insertions, 64 deletions
diff --git a/chromium/chrome/browser/ui/webui/media_router/media_router_ui_unittest.cc b/chromium/chrome/browser/ui/webui/media_router/media_router_ui_unittest.cc
index b6a7d62f329..cc65de51976 100644
--- a/chromium/chrome/browser/ui/webui/media_router/media_router_ui_unittest.cc
+++ b/chromium/chrome/browser/ui/webui/media_router/media_router_ui_unittest.cc
@@ -15,6 +15,7 @@
#include "chrome/browser/media/router/test/mock_media_router.h"
#include "chrome/browser/media/router/test/test_helper.h"
#include "chrome/browser/sessions/session_tab_helper.h"
+#include "chrome/browser/ui/media_router/media_router_ui_helper.h"
#include "chrome/browser/ui/webui/media_router/media_router_webui_message_handler.h"
#include "chrome/common/media_router/media_route.h"
#include "chrome/common/media_router/media_source_helper.h"
@@ -103,18 +104,18 @@ class PresentationRequestCallbacks {
PresentationRequestCallbacks() {}
explicit PresentationRequestCallbacks(
- const content::PresentationError& expected_error)
+ const blink::mojom::PresentationError& expected_error)
: expected_error_(expected_error) {}
- void Success(const content::PresentationInfo&, const MediaRoute&) {}
+ void Success(const blink::mojom::PresentationInfo&, const MediaRoute&) {}
- void Error(const content::PresentationError& error) {
+ void Error(const blink::mojom::PresentationError& error) {
EXPECT_EQ(expected_error_.error_type, error.error_type);
EXPECT_EQ(expected_error_.message, error.message);
}
private:
- content::PresentationError expected_error_;
+ blink::mojom::PresentationError expected_error_;
};
class TestMediaRouterUI : public MediaRouterUI {
@@ -123,9 +124,9 @@ class TestMediaRouterUI : public MediaRouterUI {
: MediaRouterUI(web_ui), router_(router) {}
~TestMediaRouterUI() override = default;
- MediaRouter* GetMediaRouter() override { return router_; }
-
private:
+ MediaRouter* GetMediaRouter() const override { return router_; }
+
MediaRouter* router_;
DISALLOW_COPY_AND_ASSIGN(TestMediaRouterUI);
};
@@ -172,8 +173,7 @@ class MediaRouterUITest : public ChromeRenderViewHostTestHarness {
void CreateMediaRouterUI(Profile* profile) {
SessionTabHelper::CreateForWebContents(web_contents());
- web_ui_contents_.reset(
- WebContents::Create(WebContents::CreateParams(profile)));
+ web_ui_contents_ = WebContents::Create(WebContents::CreateParams(profile));
web_ui_.set_web_contents(web_ui_contents_.get());
media_router_ui_ =
std::make_unique<TestMediaRouterUI>(&web_ui_, &mock_router_);
@@ -234,6 +234,14 @@ class MediaRouterUITest : public ChromeRenderViewHostTestHarness {
base::test::ScopedFeatureList scoped_feature_list_;
};
+class MediaRouterUIIncognitoTest : public MediaRouterUITest {
+ protected:
+ content::BrowserContext* GetBrowserContext() override {
+ return static_cast<Profile*>(MediaRouterUITest::GetBrowserContext())
+ ->GetOffTheRecordProfile();
+ }
+};
+
TEST_F(MediaRouterUITest, RouteCreationTimeoutForTab) {
CreateMediaRouterUI(profile());
std::vector<MediaRouteResponseCallback> callbacks;
@@ -337,8 +345,8 @@ TEST_F(MediaRouterUITest, RouteCreationParametersCantBeCreated) {
std::move(sink_callback).Run("foundSinkId");
}
-TEST_F(MediaRouterUITest, RouteRequestFromIncognito) {
- CreateMediaRouterUI(profile()->GetOffTheRecordProfile());
+TEST_F(MediaRouterUIIncognitoTest, RouteRequestFromIncognito) {
+ CreateMediaRouterUI(profile());
media_router_ui_->OnDefaultPresentationChanged(presentation_request_);
EXPECT_CALL(mock_router_,
@@ -371,7 +379,7 @@ TEST_F(MediaRouterUITest, SortedSinks) {
// Sorted order is 2, 3, 1.
media_router_ui_->OnResultsUpdated(unsorted_sinks);
- const auto& sorted_sinks = media_router_ui_->sinks_;
+ const auto& sorted_sinks = media_router_ui_->GetEnabledSinks();
EXPECT_EQ(sink_name2, sorted_sinks[0].sink.name());
EXPECT_EQ(sink_id3, sorted_sinks[1].sink.id());
EXPECT_EQ(sink_id1, sorted_sinks[2].sink.id());
@@ -400,7 +408,7 @@ TEST_F(MediaRouterUITest, SortSinksByIconType) {
// Sorted order is CAST, CAST_AUDIO_GROUP "A", CAST_AUDIO_GROUP "B",
// CAST_AUDIO, HANGOUT, GENERIC.
media_router_ui_->OnResultsUpdated(unsorted_sinks);
- const auto& sorted_sinks = media_router_ui_->sinks_;
+ const auto& sorted_sinks = media_router_ui_->GetEnabledSinks();
EXPECT_EQ(sink6.sink.id(), sorted_sinks[0].sink.id());
EXPECT_EQ(sink4.sink.id(), sorted_sinks[1].sink.id());
EXPECT_EQ(sink2.sink.id(), sorted_sinks[2].sink.id());
@@ -425,11 +433,11 @@ TEST_F(MediaRouterUITest, FilterNonDisplayRoutes) {
routes.push_back(display_route_2);
media_router_ui_->OnRoutesUpdated(routes, std::vector<MediaRoute::Id>());
- ASSERT_EQ(2u, media_router_ui_->routes_.size());
- EXPECT_TRUE(display_route_1.Equals(media_router_ui_->routes_[0]));
- EXPECT_TRUE(media_router_ui_->routes_[0].for_display());
- EXPECT_TRUE(display_route_2.Equals(media_router_ui_->routes_[1]));
- EXPECT_TRUE(media_router_ui_->routes_[1].for_display());
+ ASSERT_EQ(2u, media_router_ui_->routes().size());
+ EXPECT_TRUE(display_route_1.Equals(media_router_ui_->routes()[0]));
+ EXPECT_TRUE(media_router_ui_->routes()[0].for_display());
+ EXPECT_TRUE(display_route_2.Equals(media_router_ui_->routes()[1]));
+ EXPECT_TRUE(media_router_ui_->routes()[1].for_display());
}
TEST_F(MediaRouterUITest, FilterNonDisplayJoinableRoutes) {
@@ -453,11 +461,11 @@ TEST_F(MediaRouterUITest, FilterNonDisplayJoinableRoutes) {
joinable_route_ids.push_back("routeId3");
media_router_ui_->OnRoutesUpdated(routes, joinable_route_ids);
- ASSERT_EQ(2u, media_router_ui_->joinable_route_ids_.size());
+ ASSERT_EQ(2u, media_router_ui_->joinable_route_ids().size());
EXPECT_EQ(display_route_1.media_route_id(),
- media_router_ui_->joinable_route_ids_[0]);
+ media_router_ui_->joinable_route_ids()[0]);
EXPECT_EQ(display_route_2.media_route_id(),
- media_router_ui_->joinable_route_ids_[1]);
+ media_router_ui_->joinable_route_ids()[1]);
}
TEST_F(MediaRouterUITest, UIMediaRoutesObserverAssignsCurrentCastModes) {
@@ -557,42 +565,9 @@ TEST_F(MediaRouterUITest, UIMediaRoutesObserverSkipsUnavailableCastModes) {
observer.reset();
}
-TEST_F(MediaRouterUITest, GetExtensionNameExtensionPresent) {
- std::string id = "extensionid";
- GURL url = GURL("chrome-extension://" + id);
- std::unique_ptr<extensions::ExtensionRegistry> registry =
- std::make_unique<extensions::ExtensionRegistry>(nullptr);
- scoped_refptr<extensions::Extension> app =
- extensions::ExtensionBuilder(
- "test app name", extensions::ExtensionBuilder::Type::PLATFORM_APP)
- .SetID(id)
- .Build();
-
- ASSERT_TRUE(registry->AddEnabled(app));
- EXPECT_EQ("test app name",
- MediaRouterUI::GetExtensionName(url, registry.get()));
-}
-
-TEST_F(MediaRouterUITest, GetExtensionNameEmptyWhenNotInstalled) {
- std::string id = "extensionid";
- GURL url = GURL("chrome-extension://" + id);
- std::unique_ptr<extensions::ExtensionRegistry> registry =
- std::make_unique<extensions::ExtensionRegistry>(nullptr);
-
- EXPECT_EQ("", MediaRouterUI::GetExtensionName(url, registry.get()));
-}
-
-TEST_F(MediaRouterUITest, GetExtensionNameEmptyWhenNotExtensionURL) {
- GURL url = GURL("https://www.google.com");
- std::unique_ptr<extensions::ExtensionRegistry> registry =
- std::make_unique<extensions::ExtensionRegistry>(nullptr);
-
- EXPECT_EQ("", MediaRouterUI::GetExtensionName(url, registry.get()));
-}
-
TEST_F(MediaRouterUITest, NotFoundErrorOnCloseWithNoSinks) {
- content::PresentationError expected_error(
- content::PresentationErrorType::PRESENTATION_ERROR_NO_AVAILABLE_SCREENS,
+ blink::mojom::PresentationError expected_error(
+ blink::mojom::PresentationErrorType::NO_AVAILABLE_SCREENS,
"No screens found.");
PresentationRequestCallbacks request_callbacks(expected_error);
start_presentation_context_ = std::make_unique<StartPresentationContext>(
@@ -608,8 +583,8 @@ TEST_F(MediaRouterUITest, NotFoundErrorOnCloseWithNoSinks) {
}
TEST_F(MediaRouterUITest, NotFoundErrorOnCloseWithNoCompatibleSinks) {
- content::PresentationError expected_error(
- content::PresentationErrorType::PRESENTATION_ERROR_NO_AVAILABLE_SCREENS,
+ blink::mojom::PresentationError expected_error(
+ blink::mojom::PresentationErrorType::NO_AVAILABLE_SCREENS,
"No screens found.");
PresentationRequestCallbacks request_callbacks(expected_error);
start_presentation_context_ = std::make_unique<StartPresentationContext>(
@@ -638,9 +613,8 @@ TEST_F(MediaRouterUITest, NotFoundErrorOnCloseWithNoCompatibleSinks) {
}
TEST_F(MediaRouterUITest, AbortErrorOnClose) {
- content::PresentationError expected_error(
- content::PresentationErrorType::
- PRESENTATION_ERROR_PRESENTATION_REQUEST_CANCELLED,
+ blink::mojom::PresentationError expected_error(
+ blink::mojom::PresentationErrorType::PRESENTATION_REQUEST_CANCELLED,
"Dialog closed.");
PresentationRequestCallbacks request_callbacks(expected_error);
start_presentation_context_ = std::make_unique<StartPresentationContext>(
@@ -786,8 +760,8 @@ TEST_F(MediaRouterUITest, SendInitialMediaStatusUpdate) {
TEST_F(MediaRouterUITest, SetsForcedCastModeWithPresentationURLs) {
presentation_request_.presentation_urls.push_back(
GURL("https://google.com/presentation2"));
- content::PresentationError expected_error(
- content::PresentationErrorType::PRESENTATION_ERROR_NO_AVAILABLE_SCREENS,
+ blink::mojom::PresentationError expected_error(
+ blink::mojom::PresentationErrorType::NO_AVAILABLE_SCREENS,
"No screens found.");
PresentationRequestCallbacks request_callbacks(expected_error);
start_presentation_context_ = std::make_unique<StartPresentationContext>(
@@ -798,8 +772,7 @@ TEST_F(MediaRouterUITest, SetsForcedCastModeWithPresentationURLs) {
base::Unretained(&request_callbacks)));
SessionTabHelper::CreateForWebContents(web_contents());
- web_ui_contents_.reset(
- WebContents::Create(WebContents::CreateParams(profile())));
+ web_ui_contents_ = WebContents::Create(WebContents::CreateParams(profile()));
web_ui_.set_web_contents(web_ui_contents_.get());
media_router_ui_ =
std::make_unique<TestMediaRouterUI>(&web_ui_, &mock_router_);
View Lorry Controller Status