Commit eb359b26 authored by Mounir Lamouri's avatar Mounir Lamouri Committed by Commit Bot

Media Notifications: do not show the scheme and trivial subdomains on desktop.

In practice, it means:
 - https://www.example.com => example.com
 - http://www.example.com => example.com
 - https://m.example.com => m.example.com

This is implemented at the Media Session level which should affect all usage of
it.

Bug: 1011900
Change-Id: Id3007daebe200ed6b4ccf3d574e5b15ba8424903
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1846658Reviewed-by: default avatarTommy Steimel <steimel@chromium.org>
Commit-Queue: Mounir Lamouri <mlamouri@chromium.org>
Cr-Commit-Position: refs/heads/master@{#704015}
parent ab71b7d6
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include "base/strings/string_util.h" #include "base/strings/string_util.h"
#include "base/timer/timer.h" #include "base/timer/timer.h"
#include "build/build_config.h" #include "build/build_config.h"
#include "components/url_formatter/elide_url.h" #include "components/url_formatter/url_formatter.h"
#include "content/browser/media/session/audio_focus_delegate.h" #include "content/browser/media/session/audio_focus_delegate.h"
#include "content/browser/media/session/media_session_controller.h" #include "content/browser/media/session/media_session_controller.h"
#include "content/browser/media/session/media_session_player_observer.h" #include "content/browser/media/session/media_session_player_observer.h"
...@@ -1344,8 +1344,12 @@ void MediaSessionImpl::RebuildAndNotifyMetadataChanged() { ...@@ -1344,8 +1344,12 @@ void MediaSessionImpl::RebuildAndNotifyMetadataChanged() {
base::string16 formatted_origin = base::string16 formatted_origin =
url.SchemeIsFile() url.SchemeIsFile()
? content_client->GetLocalizedString(IDS_MEDIA_SESSION_FILE_SOURCE) ? content_client->GetLocalizedString(IDS_MEDIA_SESSION_FILE_SOURCE)
: url_formatter::FormatOriginForSecurityDisplay( : url_formatter::FormatUrl(
url::Origin::Create(url)); url::Origin::Create(url).GetURL(),
url_formatter::kFormatUrlOmitDefaults |
url_formatter::kFormatUrlOmitHTTPS |
url_formatter::kFormatUrlOmitTrivialSubdomains,
net::UnescapeRule::SPACES, nullptr, nullptr, nullptr);
metadata.source_title = formatted_origin; metadata.source_title = formatted_origin;
// If we have no artwork in |images_| or the arwork has changed then we should // If we have no artwork in |images_| or the arwork has changed then we should
......
...@@ -267,9 +267,11 @@ class MediaSessionImplBrowserTest : public content::ContentBrowserTest { ...@@ -267,9 +267,11 @@ class MediaSessionImplBrowserTest : public content::ContentBrowserTest {
bool IsDucking() const { return media_session_->is_ducking_; } bool IsDucking() const { return media_session_->is_ducking_; }
base::string16 GetExpectedSourceTitle() { base::string16 GetExpectedSourceTitle() {
return base::StrCat( base::string16 expected_title =
{kExpectedSourceTitlePrefix, base::StrCat({kExpectedSourceTitlePrefix,
base::NumberToString16(embedded_test_server()->port())}); base::NumberToString16(embedded_test_server()->port())});
return expected_title.substr(strlen("http://"));
} }
protected: protected:
......
...@@ -99,7 +99,7 @@ class MediaSessionImplServiceRoutingTest ...@@ -99,7 +99,7 @@ class MediaSessionImplServiceRoutingTest
sub_frame_ = main_frame_->AppendChild("sub_frame"); sub_frame_ = main_frame_->AppendChild("sub_frame");
empty_metadata_.title = contents()->GetTitle(); empty_metadata_.title = contents()->GetTitle();
empty_metadata_.source_title = base::ASCIIToUTF16("http://www.example.com"); empty_metadata_.source_title = base::ASCIIToUTF16("example.com");
} }
void TearDown() override { void TearDown() override {
...@@ -780,7 +780,7 @@ TEST_F(MediaSessionImplServiceRoutingTest, NotifyObserverOnNavigation) { ...@@ -780,7 +780,7 @@ TEST_F(MediaSessionImplServiceRoutingTest, NotifyObserverOnNavigation) {
media_session::MediaMetadata expected_metadata; media_session::MediaMetadata expected_metadata;
expected_metadata.title = contents()->GetTitle(); expected_metadata.title = contents()->GetTitle();
expected_metadata.source_title = base::ASCIIToUTF16("http://www.google.com"); expected_metadata.source_title = base::ASCIIToUTF16("google.com");
observer.WaitForExpectedMetadata(expected_metadata); observer.WaitForExpectedMetadata(expected_metadata);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment