Log metrics for the new Default Search Engine geolocation setting.

chrome/browser/android/search_geolocation/search_geolocation_disclosure_tab_helper.cc

 // Copyright 2016 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/android/search_geolocation/search_geolocation_disclosure_tab_helper.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/command_line.h"
 #include "base/feature_list.h"
@@ skipping 189 matching lines @@
           prefs::kSearchGeolocationPreDisclosureMetricsRecorded)) {
     ContentSetting status =
         HostContentSettingsMapFactory::GetForProfile(GetProfile())
             ->GetContentSetting(gurl, gurl, CONTENT_SETTINGS_TYPE_GEOLOCATION,
                                 std::string());
     UMA_HISTOGRAM_ENUMERATION(
         "GeolocationDisclosure.PreDisclosureContentSetting",
         static_cast<base::HistogramBase::Sample>(status),
         static_cast<base::HistogramBase::Sample>(CONTENT_SETTING_NUM_SETTINGS) +
             1);
+
+    SearchGeolocationService* service =
+        SearchGeolocationService::Factory::GetForBrowserContext(GetProfile());
+    UMA_HISTOGRAM_BOOLEAN("GeolocationDisclosure.PreDisclosureDSESetting",
+                          service->GetDSEGeolocationSetting());
+
     prefs->SetBoolean(prefs::kSearchGeolocationPreDisclosureMetricsRecorded,
                       true);
   }
 }
 
 void SearchGeolocationDisclosureTabHelper::RecordPostDisclosureMetrics(
     const GURL& gurl) {
   PrefService* prefs = GetProfile()->GetPrefs();
   if (!prefs->GetBoolean(
           prefs::kSearchGeolocationPostDisclosureMetricsRecorded)) {
     ContentSetting status =
         HostContentSettingsMapFactory::GetForProfile(GetProfile())
             ->GetContentSetting(gurl, gurl, CONTENT_SETTINGS_TYPE_GEOLOCATION,
                                 std::string());
     UMA_HISTOGRAM_ENUMERATION(
         "GeolocationDisclosure.PostDisclosureContentSetting",
         static_cast<base::HistogramBase::Sample>(status),
         static_cast<base::HistogramBase::Sample>(CONTENT_SETTING_NUM_SETTINGS) +
             1);
+
+    SearchGeolocationService* service =
+        SearchGeolocationService::Factory::GetForBrowserContext(GetProfile());
+    UMA_HISTOGRAM_BOOLEAN("GeolocationDisclosure.PostDisclosureDSESetting",
+                          service->GetDSEGeolocationSetting());
+
     prefs->SetBoolean(prefs::kSearchGeolocationPostDisclosureMetricsRecorded,
                       true);
   }
 }
 
 Profile* SearchGeolocationDisclosureTabHelper::GetProfile() {
   return Profile::FromBrowserContext(web_contents()->GetBrowserContext());
 }
 
 // static
 void SetIgnoreUrlChecksForTesting(
     JNIEnv* env,
     const base::android::JavaParamRef<jclass>& clazz) {
   gIgnoreUrlChecksForTesting = true;
 }
 
 // static
 void SetDayOffsetForTesting(JNIEnv* env,
                             const base::android::JavaParamRef<jclass>& clazz,
                             jint days) {
   gDayOffsetForTesting = days;
 }