diff options
Diffstat (limited to 'chromium/extensions/browser/extension_protocols.cc')
| -rw-r--r-- | chromium/extensions/browser/extension_protocols.cc | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/chromium/extensions/browser/extension_protocols.cc b/chromium/extensions/browser/extension_protocols.cc index 87082a4fe65..5a7e8ea1b62 100644 --- a/chromium/extensions/browser/extension_protocols.cc +++ b/chromium/extensions/browser/extension_protocols.cc @@ -28,12 +28,12 @@ #include "base/metrics/histogram.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" +#include "base/metrics/user_metrics.h" #include "base/numerics/safe_conversions.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread_restrictions.h" #include "base/timer/elapsed_timer.h" @@ -57,6 +57,7 @@ #include "extensions/browser/guest_view/web_view/web_view_guest.h" #include "extensions/browser/guest_view/web_view/web_view_renderer_state.h" #include "extensions/browser/info_map.h" +#include "extensions/browser/media_router_extension_access_logger.h" #include "extensions/browser/url_request_util.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" @@ -84,6 +85,7 @@ #include "third_party/blink/public/common/features.h" #include "third_party/blink/public/common/loader/resource_type_util.h" #include "third_party/blink/public/mojom/loader/resource_load_info.mojom-shared.h" +#include "url/origin.h" #include "url/url_util.h" using content::BrowserContext; @@ -144,10 +146,8 @@ void ReadResourceFilePathAndLastModifiedTime( base::TimeDelta::FromDays(30).InSeconds(), 50); } else { UMA_HISTOGRAM_CUSTOM_COUNTS("Extensions.ResourceLastModifiedNegativeDelta", - -delta_seconds, - 1, - base::TimeDelta::FromDays(30).InSeconds(), - 50); + -delta_seconds, 1, + base::TimeDelta::FromDays(30).InSeconds(), 50); } } @@ -464,6 +464,20 @@ class ExtensionURLLoaderFactory : public network::mojom::URLLoaderFactory { &send_cors_header, &follow_symlinks_anywhere); } + // If the extension is the Media Router Component Extension used to support + // Casting scenarios, log metrics needed to track migration away from this + // extension. + // TODO(crbug.com/1097594): Remove this metric logging once migration away + // from the Media Router Component Extension completes. + const MediaRouterExtensionAccessLogger* media_router_access_logger = + ExtensionsBrowserClient::Get()->GetMediaRouterAccessLogger(); + if (media_router_access_logger && request.request_initiator.has_value() && + (extension.get()->id() == extension_misc::kCastExtensionIdRelease || + extension.get()->id() == extension_misc::kCastExtensionIdDev)) { + media_router_access_logger->LogMediaRouterComponentExtensionUse( + request.request_initiator.value(), browser_context_); + } + if (IsBackgroundPageURL(request.url)) { // Handle background page requests immediately with a simple generated // chunk of HTML. @@ -584,8 +598,8 @@ class ExtensionURLLoaderFactory : public network::mojom::URLLoaderFactory { bool send_cors_header) { request.url = net::FilePathToFileURL(*read_file_path); - base::PostTask( - FROM_HERE, {content::BrowserThread::IO}, + content::GetIOThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce( &StartVerifyJob, std::move(request), std::move(loader), std::move(client), std::move(content_verifier), resource, |