Fixed the Touchscreen.TouchEventsEnabled histogram to record the correct values on X11 and Ozone ba…

chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h

Index: chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h
diff --git a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h
index 43a0d42ba9eef1b5b8845a521225ba32ad9a72e6..38077ed44c5887d96a87c72f5c9ec5615196511b 100644
--- a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h
+++ b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h
@@ -18,6 +18,14 @@ namespace chrome {
 void AddMetricsExtraParts(ChromeBrowserMainParts* main_parts);
 }
 
+#if defined(USE_OZONE) || defined(USE_X11)

[Alexei Svitkine (slow), 2015/07/07 22:00:58]

Nit: I don't think it's necessary to guard forward declarations. It will still
compile without the guards - they just make this code messier.

[bruthig, 2015/07/08 20:29:52]

Done.

+
+namespace ui {
+class InputDeviceEventObserver;
+}  // namespace ui
+
+#endif  // defined(USE_OZONE) || defined(USE_X11)
+
 class ChromeBrowserMainExtraPartsMetrics
     : public ChromeBrowserMainExtraParts,
       public gfx::DisplayObserver,
@@ -59,6 +67,10 @@ class ChromeBrowserMainExtraPartsMetrics
   // Measures start up performance of the first active web contents.
   scoped_ptr<FirstWebContentsProfiler> first_web_contents_profiler_;
 
+#if defined(USE_OZONE) || defined(USE_X11)
+  scoped_ptr<ui::InputDeviceEventObserver> input_device_event_observer_;
+#endif  // defined(USE_OZONE) || defined(USE_X11)
+
   DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsMetrics);
 };