Remove logging code for expired Site Isolation cmdline flag metrics.

Bug: 1053144
Change-Id: Ie30d7ba277fac9e87d763a0a7ccadeb163453942
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2098267
Commit-Queue: Łukasz Anforowicz <lukasza@chromium.org>
Reviewed-by: Łukasz Anforowicz <lukasza@chromium.org>
Auto-Submit: Alex Moshchuk <alexmos@chromium.org>
Cr-Commit-Position: refs/heads/master@{#749784}

content/browser/browser_main_loop.cc

@@ -880,9 +880,6 @@ int BrowserMainLoop::PreCreateThreads() {
   // happen.
   SiteIsolationPolicy::ApplyGlobalIsolatedOrigins();
 
-  // Record metrics about which site isolation flags have been turned on.
-  SiteIsolationPolicy::StartRecordingSiteIsolationFlagUsage();
-
   return result_code_;
 }
 

content/browser/child_process_security_policy_impl.cc

@@ -1641,14 +1641,6 @@ void ChildProcessSecurityPolicyImpl::AddIsolatedOrigins(
   // BrowsingInstance IDs.
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
-  if (IsolatedOriginSource::COMMAND_LINE == source) {
-    size_t number_of_origins = std::count_if(
-        patterns.cbegin(), patterns.cend(),
-        [](const IsolatedOriginPattern& p) { return p.is_valid(); });
-    UMA_HISTOGRAM_COUNTS_1000("SiteIsolation.IsolateOrigins.Size",
-                              number_of_origins);
-  }
-
   base::AutoLock isolated_origins_lock(isolated_origins_lock_);
 
   for (const IsolatedOriginPattern& pattern : patterns) {

content/public/browser/site_isolation_policy.cc

@@ -12,12 +12,8 @@
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/feature_list.h"
-#include "base/macros.h"
 #include "base/metrics/field_trial_params.h"
-#include "base/metrics/histogram_macros.h"
-#include "base/no_destructor.h"
 #include "base/strings/string_split.h"
-#include "base/timer/timer.h"
 #include "build/build_config.h"
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/content_browser_client.h"
@@ -183,33 +179,4 @@ void SiteIsolationPolicy::ApplyGlobalIsolatedOrigins() {
       ChildProcessSecurityPolicy::IsolatedOriginSource::BUILT_IN);
 }
 
-// static
-void SiteIsolationPolicy::StartRecordingSiteIsolationFlagUsage() {
-  RecordSiteIsolationFlagUsage();
-  // Record the flag usage metrics every 24 hours.  Even though site isolation
-  // flags can't change dynamically at runtime, collecting these stats daily
-  // helps determine the overall population of users who run with a given flag
-  // on any given day.
-  static base::NoDestructor<base::RepeatingTimer> update_stats_timer;
-  update_stats_timer->Start(
-      FROM_HERE, base::TimeDelta::FromHours(24),
-      base::BindRepeating(&SiteIsolationPolicy::RecordSiteIsolationFlagUsage));
-}
-
-// static
-void SiteIsolationPolicy::RecordSiteIsolationFlagUsage() {
-  // For --site-per-process and --isolate-origins, include flags specified on
-  // command-line, in chrome://flags, and via enterprise policy (i.e., include
-  // switches::kSitePerProcess and switches::kIsolateOrigins).  Exclude these
-  // modes being set through field trials (i.e., exclude
-  // features::kSitePerProcess and features::IsolateOrigins).
-  UMA_HISTOGRAM_BOOLEAN("SiteIsolation.Flags.IsolateOrigins",
-                        base::CommandLine::ForCurrentProcess()->HasSwitch(
-                            switches::kIsolateOrigins));
-
-  UMA_HISTOGRAM_BOOLEAN("SiteIsolation.Flags.SitePerProcess",
-                        base::CommandLine::ForCurrentProcess()->HasSwitch(
-                            switches::kSitePerProcess));
-}
-
 }  // namespace content

content/public/browser/site_isolation_policy.h

@@ -54,21 +54,13 @@ class CONTENT_EXPORT SiteIsolationPolicy {
   // startup.
   static void ApplyGlobalIsolatedOrigins();
 
-  // Records metrics about which site isolation command-line flags are present,
-  // and sets up a timer to keep recording them every 24 hours.  This should be
-  // called once on browser startup.
-  static void StartRecordingSiteIsolationFlagUsage();
-
  private:
   SiteIsolationPolicy();  // Not instantiable.
 
   // Gets isolated origins from cmdline and/or from field trial param.
   static std::string GetIsolatedOriginsFromCommandLine();
   static std::string GetIsolatedOriginsFromFieldTrial();
 
-  // Records metrics about which site isolation command-line flags are present.
-  static void RecordSiteIsolationFlagUsage();
-
   DISALLOW_COPY_AND_ASSIGN(SiteIsolationPolicy);
 };