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

 // Copyright (c) 2013 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.
 
 #ifndef CHROME_BROWSER_METRICS_CHROME_BROWSER_MAIN_EXTRA_PARTS_METRICS_H_
 #define CHROME_BROWSER_METRICS_CHROME_BROWSER_MAIN_EXTRA_PARTS_METRICS_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chrome_browser_main_extra_parts.h"
 #include "chrome/browser/metrics/first_web_contents_profiler.h"
 #include "ui/gfx/display_observer.h"
 
 class ChromeBrowserMainParts;
 
 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,
       public FirstWebContentsProfiler::Delegate {
  public:
   ChromeBrowserMainExtraPartsMetrics();
   ~ChromeBrowserMainExtraPartsMetrics() override;
 
   // Overridden from ChromeBrowserMainExtraParts:
   void PreProfileInit() override;
@@ skipping 21 matching lines @@
   // A cached value for the number of displays.
   int display_count_;
 
   // True iff |this| instance is registered as an observer of the native
   // screen.
   bool is_screen_observer_;
 
   // 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);
 };
 
 #endif  // CHROME_BROWSER_METRICS_CHROME_BROWSER_MAIN_EXTRA_PARTS_METRICS_H_