Disable UKM on Android

chrome/browser/metrics/chrome_metrics_services_manager_client.cc

Index: chrome/browser/metrics/chrome_metrics_services_manager_client.cc
diff --git a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc
index 83594d471f40d66c0401f464d54668574ef125eb..ac852e19a88f80ce7244116c41312bd57bd243f0 100644
--- a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc
+++ b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc
@@ -10,11 +10,13 @@
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/task_scheduler/post_task.h"
+#include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
 #include "chrome/browser/metrics/chrome_metrics_service_client.h"
 #include "chrome/browser/metrics/variations/chrome_variations_service_client.h"
 #include "chrome/browser/metrics/variations/ui_string_overrider_factory.h"
+#include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_otr_state.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/installer/util/google_update_settings.h"
@@ -288,5 +290,15 @@ bool ChromeMetricsServicesManagerClient::IsMetricsReportingForceEnabled() {
 }
 
 bool ChromeMetricsServicesManagerClient::IsIncognitoSessionActive() {
-  return chrome::IsIncognitoSessionActive();
+#if defined(OS_ANDROID)
+  // TODO(crbug/739971) On Android, we don't get notifications from TabModel
+  // when incognito tabs are opened, so this won't get re-evaluated reliably
+  // yet.  Assume there always an incognito tab open, which will keep UKM
+  // disabled.
+  return false;

[rkaplow, 2017/07/07 13:53:41]

shouldn't this be true?

[Steven Holte, 2017/07/07 19:08:41]

Yes, fixed.

+#else
+  // Depending directly on BrowserList, since that is the implementation
+  // that we get correct notifications for.
+  return chrome::BrowserList::IsIncognitoSessionActive();
+#endif
 }