Skip to content

Commit

Permalink
Remove TabMetricsLogger.
Browse files Browse the repository at this point in the history
The UKM data generated by TabMetricsLogger is not used.

Bug: 784639
Change-Id: I121ba04b49affedd55f500713f627c73b152e28c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4062908
Commit-Queue: Erik Chen <erikchen@chromium.org>
Reviewed-by: Erik Chen <erikchen@chromium.org>
Reviewed-by: Michael Martis <martis@chromium.org>
Auto-Submit: Francois Pierre Doray <fdoray@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1084845}
  • Loading branch information
fdoray authored and Chromium LUCI CQ committed Dec 19, 2022
1 parent e21eca8 commit 64453e8
Show file tree
Hide file tree
Showing 9 changed files with 41 additions and 1,173 deletions.
2 changes: 0 additions & 2 deletions chrome/browser/BUILD.gn
Expand Up @@ -4104,8 +4104,6 @@ static_library("browser") {
"resource_coordinator/tab_manager.h",
"resource_coordinator/tab_manager_resource_coordinator_signal_observer.cc",
"resource_coordinator/tab_manager_resource_coordinator_signal_observer.h",
"resource_coordinator/tab_metrics_logger.cc",
"resource_coordinator/tab_metrics_logger.h",
"resource_coordinator/usage_clock.cc",
"resource_coordinator/usage_clock.h",
"resources_integrity.cc",
Expand Down
1 change: 1 addition & 0 deletions chrome/browser/ash/BUILD.gn
Expand Up @@ -3735,6 +3735,7 @@ source_set("ash") {
"//components/services/unzip/public/mojom",
"//components/session_manager:base",
"//components/signin/public/base",
"//components/site_engagement/content",
"//components/soda:constants",
"//components/spellcheck/browser",
"//components/startup_metric_utils/browser",
Expand Down
23 changes: 20 additions & 3 deletions chrome/browser/ash/power/ml/user_activity_manager.cc
Expand Up @@ -19,7 +19,6 @@
#include "chrome/browser/ash/crosapi/crosapi_manager.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/resource_coordinator/tab_metrics_logger.h"
#include "chrome/browser/tab_contents/form_interaction_tab_helper.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_list.h"
Expand All @@ -28,6 +27,7 @@
#include "chromeos/ash/components/dbus/dbus_thread_manager.h"
#include "chromeos/constants/devicetype.h"
#include "chromeos/dbus/power_manager/power_supply_properties.pb.h"
#include "components/site_engagement/content/site_engagement_service.h"
#include "ui/aura/client/aura_constants.h"

namespace ash {
Expand Down Expand Up @@ -118,6 +118,24 @@ bool ShouldUseLacrosFeatures() {
return false;
}

int GetRoundedOrInvalidEngagementScore(content::WebContents* contents) {
if (!site_engagement::SiteEngagementService::IsEnabled()) {
return -1;
}

auto* service = site_engagement::SiteEngagementService::Get(
contents->GetBrowserContext());
DCHECK(service);

// Scores range from 0 to 100. Round down to a multiple of 10 to conform to
// privacy guidelines.
double raw_score = service->GetScore(contents->GetVisibleURL());
int rounded_score = static_cast<int>(raw_score / 10) * 10;
DCHECK_LE(0, rounded_score);
DCHECK_GE(100, rounded_score);
return rounded_score;
}

} // namespace

struct UserActivityManager::PreviousIdleEventData {
Expand Down Expand Up @@ -585,8 +603,7 @@ TabProperty UserActivityManager::UpdateOpenTabURL() {
// Domain could be empty.
property.domain = contents->GetLastCommittedURL().host();
// Engagement score could be -1 if engagement service is disabled.
property.engagement_score =
TabMetricsLogger::GetSiteEngagementScore(contents);
property.engagement_score = GetRoundedOrInvalidEngagementScore(contents);
property.has_form_entry =
FormInteractionTabHelper::FromWebContents(contents)
->had_form_interaction();
Expand Down
22 changes: 20 additions & 2 deletions chrome/browser/lacros/web_page_info_lacros.cc
Expand Up @@ -5,18 +5,36 @@
#include "chrome/browser/lacros/web_page_info_lacros.h"

#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/resource_coordinator/tab_metrics_logger.h"
#include "chrome/browser/tab_contents/form_interaction_tab_helper.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/browser_window.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chromeos/lacros/lacros_service.h"
#include "components/site_engagement/content/site_engagement_service.h"
#include "ui/aura/window.h"

namespace crosapi {
namespace {

int GetRoundedOrInvalidEngagementScore(content::WebContents* contents) {
if (!site_engagement::SiteEngagementService::IsEnabled()) {
return -1;
}

auto* service = site_engagement::SiteEngagementService::Get(
contents->GetBrowserContext());
DCHECK(service);

// Scores range from 0 to 100. Round down to a multiple of 10 to conform to
// privacy guidelines.
double raw_score = service->GetScore(contents->GetVisibleURL());
int rounded_score = static_cast<int>(raw_score / 10) * 10;
DCHECK_LE(0, rounded_score);
DCHECK_GE(100, rounded_score);
return rounded_score;
}

mojom::WebPageInfoPtr PopulateWebPageInfoFromBrowser(const Browser* browser) {
if (browser->profile()->IsOffTheRecord())
return nullptr;
Expand All @@ -42,7 +60,7 @@ mojom::WebPageInfoPtr PopulateWebPageInfoFromBrowser(const Browser* browser) {
web_page_info->domain = contents->GetLastCommittedURL().host();
// Engagement score could be -1 if engagement service is disabled.
web_page_info->engagement_score =
TabMetricsLogger::GetSiteEngagementScore(contents);
GetRoundedOrInvalidEngagementScore(contents);
web_page_info->has_form_entry =
FormInteractionTabHelper::FromWebContents(contents)
->had_form_interaction();
Expand Down
271 changes: 0 additions & 271 deletions chrome/browser/resource_coordinator/tab_metrics_logger.cc

This file was deleted.

0 comments on commit 64453e8

Please sign in to comment.