Move some global feature defines to buildflags

chrome/browser/interstitials/chrome_metrics_helper.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/interstitials/chrome_metrics_helper.h"
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/common/features.h"
 #include "components/history/core/browser/history_service.h"
 #include "components/rappor/rappor_service.h"
 #include "content/public/browser/web_contents.h"
 
 #if defined(ENABLE_EXTENSIONS)
 #include "chrome/browser/extensions/api/experience_sampling_private/experience_sampling.h"
 #endif
 
-#if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
+#if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
 #include "chrome/browser/ssl/captive_portal_metrics_recorder.h"
 #endif
 
 ChromeMetricsHelper::ChromeMetricsHelper(
     content::WebContents* web_contents,
     const GURL& request_url,
     const security_interstitials::MetricsHelper::ReportDetails settings,
     const std::string& sampling_event_name)
     : security_interstitials::MetricsHelper(
           request_url,
           settings,
           HistoryServiceFactory::GetForProfile(
               Profile::FromBrowserContext(web_contents->GetBrowserContext()),
               ServiceAccessType::EXPLICIT_ACCESS),
           g_browser_process->rappor_service()
               ? g_browser_process->rappor_service()->AsWeakPtr()
               : base::WeakPtr<rappor::RapporService>()),
-#if defined(ENABLE_CAPTIVE_PORTAL_DETECTION) || defined(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION) || defined(ENABLE_EXTENSIONS)
       web_contents_(web_contents),
 #endif
       request_url_(request_url),
       sampling_event_name_(sampling_event_name) {
   DCHECK(!sampling_event_name_.empty());
 }
 
 ChromeMetricsHelper::~ChromeMetricsHelper() {}
 
 void ChromeMetricsHelper::StartRecordingCaptivePortalMetrics(bool overridable) {
-#if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
+#if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
   captive_portal_recorder_.reset(
       new CaptivePortalMetricsRecorder(web_contents_, overridable));
 #endif
 }
 
 void ChromeMetricsHelper::RecordExtraShutdownMetrics() {
-#if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
+#if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
   // The captive portal metrics should be recorded when the interstitial is
   // closing (or destructing).
   if (captive_portal_recorder_)
     captive_portal_recorder_->RecordCaptivePortalUMAStatistics();
 #endif
 }
 
 void ChromeMetricsHelper::RecordExtraUserDecisionMetrics(
     security_interstitials::MetricsHelper::Decision decision) {
 #if defined(ENABLE_EXTENSIONS)
@@ skipping 44 matching lines @@
     case SET_EXTENDED_REPORTING_ENABLED:
     case SET_EXTENDED_REPORTING_DISABLED:
     case EXTENDED_REPORTING_IS_ENABLED:
     case REPORT_PHISHING_ERROR:
     case SHOW_WHITEPAPER:
     case MAX_INTERACTION:
       break;
   }
 #endif
 }