|
4124 | 4124 | #include "components/offline_pages/task/closure_task.h"
|
4125 | 4125 | #include "components/prefs/pref_service.h"
|
4126 | 4126 | -#include "components/signin/public/base/signin_pref_names.h"
|
| 4127 | + #include "ui/base/l10n/l10n_util.h" |
4127 | 4128 |
|
4128 | 4129 | namespace feed {
|
4129 |
| - namespace { |
4130 |
| -@@ -173,9 +172,6 @@ FeedStream::FeedStream(RefreshTaskSchedu |
| 4130 | +@@ -174,9 +173,6 @@ FeedStream::FeedStream(RefreshTaskSchedu |
4131 | 4131 | snippets_enabled_by_dse_.Init(prefs::kEnableSnippetsByDse, profile_prefs,
|
4132 | 4132 | preference_change_callback);
|
4133 | 4133 | has_stored_data_.Init(feed::prefs::kHasStoredData, profile_prefs);
|
|
5077 | 5077 | #include "net/base/ip_address.h"
|
5078 | 5078 | --- a/components/safe_browsing/core/browser/safe_browsing_metrics_collector.cc
|
5079 | 5079 | +++ b/components/safe_browsing/core/browser/safe_browsing_metrics_collector.cc
|
5080 |
| -@@ -13,13 +13,11 @@ |
| 5080 | +@@ -14,13 +14,11 @@ |
5081 | 5081 | #include "components/prefs/pref_service.h"
|
5082 | 5082 | #include "components/prefs/scoped_user_pref_update.h"
|
5083 | 5083 | #include "components/safe_browsing/core/browser/db/hit_report.h"
|
|
5091 | 5091 |
|
5092 | 5092 | const int kMetricsLoggingIntervalDay = 1;
|
5093 | 5093 |
|
5094 |
| -@@ -60,11 +58,6 @@ SafeBrowsingMetricsCollector::SafeBrowsi |
| 5094 | +@@ -61,11 +59,6 @@ SafeBrowsingMetricsCollector::SafeBrowsi |
5095 | 5095 | PrefService* pref_service)
|
5096 | 5096 | : pref_service_(pref_service) {
|
5097 | 5097 | pref_change_registrar_.Init(pref_service_);
|
|
5103 | 5103 | }
|
5104 | 5104 |
|
5105 | 5105 | void SafeBrowsingMetricsCollector::Shutdown() {
|
5106 |
| -@@ -72,16 +65,6 @@ void SafeBrowsingMetricsCollector::Shutd |
| 5106 | +@@ -73,16 +66,6 @@ void SafeBrowsingMetricsCollector::Shutd |
5107 | 5107 | }
|
5108 | 5108 |
|
5109 | 5109 | void SafeBrowsingMetricsCollector::StartLogging() {
|
|
5120 | 5120 | }
|
5121 | 5121 |
|
5122 | 5122 | void SafeBrowsingMetricsCollector::LogMetricsAndScheduleNextLogging() {
|
5123 |
| -@@ -90,80 +73,10 @@ void SafeBrowsingMetricsCollector::LogMe |
| 5123 | +@@ -91,80 +74,10 @@ void SafeBrowsingMetricsCollector::LogMe |
5124 | 5124 | MaybeLogDailyEsbProtegoPingSent();
|
5125 | 5125 | RemoveOldEventsFromPref();
|
5126 | 5126 |
|
|
5201 | 5201 | }
|
5202 | 5202 |
|
5203 | 5203 | void SafeBrowsingMetricsCollector::ScheduleNextLoggingAfterInterval(
|
5204 |
| -@@ -175,71 +88,16 @@ void SafeBrowsingMetricsCollector::Sched |
| 5204 | +@@ -176,75 +89,16 @@ void SafeBrowsingMetricsCollector::Sched |
5205 | 5205 | }
|
5206 | 5206 |
|
5207 | 5207 | void SafeBrowsingMetricsCollector::LogDailyOptInMetrics() {
|
|
5211 | 5211 | - IsExtendedReportingEnabled(*pref_service_));
|
5212 | 5212 | - base::UmaHistogramBoolean("SafeBrowsing.Pref.Daily.SafeBrowsingModeManaged",
|
5213 | 5213 | - IsSafeBrowsingPolicyManaged(*pref_service_));
|
| 5214 | +- base::UmaHistogramBoolean( |
| 5215 | +- "SafeBrowsing.Pref.Daily.PasswordLeakToggle", |
| 5216 | +- pref_service_->GetBoolean( |
| 5217 | +- password_manager::prefs::kPasswordLeakDetectionEnabled)); |
5214 | 5218 | }
|
5215 | 5219 |
|
5216 | 5220 | void SafeBrowsingMetricsCollector::LogDailyEventMetrics() {
|
|
5273 | 5277 | }
|
5274 | 5278 |
|
5275 | 5279 | void SafeBrowsingMetricsCollector::AddBypassEventToPref(
|
5276 |
| -@@ -284,15 +142,7 @@ std::optional<base::Time> SafeBrowsingMe |
| 5280 | +@@ -289,15 +143,7 @@ std::optional<base::Time> SafeBrowsingMe |
5277 | 5281 | std::optional<base::Time> SafeBrowsingMetricsCollector::GetLatestEventTimestamp(
|
5278 | 5282 | EventTypeFilter event_type_filter) {
|
5279 | 5283 | // Events are not logged when Safe Browsing is disabled.
|
|
5289 | 5293 | }
|
5290 | 5294 |
|
5291 | 5295 | std::optional<base::Time>
|
5292 |
| -@@ -304,45 +154,15 @@ SafeBrowsingMetricsCollector::GetLatestS |
| 5296 | +@@ -309,45 +155,15 @@ SafeBrowsingMetricsCollector::GetLatestS |
5293 | 5297 | void SafeBrowsingMetricsCollector::AddSafeBrowsingEventAndUserStateToPref(
|
5294 | 5298 | UserState user_state,
|
5295 | 5299 | EventType event_type) {
|
|
5336 | 5340 | }
|
5337 | 5341 |
|
5338 | 5342 | std::optional<SafeBrowsingMetricsCollector::Event>
|
5339 |
| -@@ -469,23 +289,6 @@ int SafeBrowsingMetricsCollector::GetEve |
| 5343 | +@@ -474,23 +290,6 @@ int SafeBrowsingMetricsCollector::GetEve |
5340 | 5344 | });
|
5341 | 5345 | }
|
5342 | 5346 |
|
|
0 commit comments