| Index: chrome/browser/interstitials/chrome_metrics_helper.cc
|
| diff --git a/chrome/browser/interstitials/chrome_metrics_helper.cc b/chrome/browser/interstitials/chrome_metrics_helper.cc
|
| index abda1aa30b948165a71ea6175f0ff2b65dc9d58a..711ecf10b11049aa0100ef01550dd619f8f1429d 100644
|
| --- a/chrome/browser/interstitials/chrome_metrics_helper.cc
|
| +++ b/chrome/browser/interstitials/chrome_metrics_helper.cc
|
| @@ -7,7 +7,6 @@
|
| #include "chrome/browser/browser_process.h"
|
| #include "chrome/browser/history/history_service_factory.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| -#include "chrome/browser/ssl/captive_portal_metrics_recorder.h"
|
| #include "components/history/core/browser/history_service.h"
|
| #include "components/rappor/rappor_service.h"
|
| #include "content/public/browser/web_contents.h"
|
| @@ -16,6 +15,10 @@
|
| #include "chrome/browser/extensions/api/experience_sampling_private/experience_sampling.h"
|
| #endif
|
|
|
| +#if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
|
| +#include "chrome/browser/ssl/captive_portal_metrics_recorder.h"
|
| +#endif
|
| +
|
| ChromeMetricsHelper::ChromeMetricsHelper(
|
| content::WebContents* web_contents,
|
| const GURL& request_url,
|
| @@ -37,15 +40,19 @@ ChromeMetricsHelper::ChromeMetricsHelper(
|
| ChromeMetricsHelper::~ChromeMetricsHelper() {}
|
|
|
| void ChromeMetricsHelper::StartRecordingCaptivePortalMetrics(bool overridable) {
|
| +#if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
|
| captive_portal_recorder_.reset(
|
| new CaptivePortalMetricsRecorder(web_contents_, overridable));
|
| +#endif
|
| }
|
|
|
| void ChromeMetricsHelper::RecordExtraShutdownMetrics() {
|
| +#if defined(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(
|
|
|