Fix Ozone build

chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc

 // 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.
 
 #include "chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 446 matching lines @@
                                                             "Enabled"
 #else
                                                             "Disabled"
 #endif
                                                             );
 #endif
 }
 
 void ChromeBrowserMainExtraPartsMetrics::PostBrowserStart() {
   RecordLinuxGlibcVersion();
-#if defined(USE_X11) && !defined(OS_CHROMEOS)
-  UMA_HISTOGRAM_ENUMERATION("Linux.WindowManager",
-                            GetLinuxWindowManager(),
-                            UMA_LINUX_WINDOW_MANAGER_COUNT);
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
   base::PostTaskWithTraits(FROM_HERE,
                            {base::MayBlock(), base::TaskPriority::BACKGROUND},
                            base::BindOnce(&RecordLinuxDistro));
+#if defined(USE_X11)

[Tom Anderson, 2017/05/30 22:57:07]

GetLinuxWindowManager above is guarded with "defined(USE_X11) &&
!defined(OS_CHROMEOS)", but here it effectively has "defined(OS_LINUX) &&
!defined(OS_CHROMEOS) && defined(USE_X11)", but this is probably OK because X11
is only used on Linux.  Personally I'd recommend splitting it out because it's
easier to understand.

[timbrown, 2017/05/30 23:03:58]

Sure. Done.

+  UMA_HISTOGRAM_ENUMERATION("Linux.WindowManager", GetLinuxWindowManager(),
+                            UMA_LINUX_WINDOW_MANAGER_COUNT);
+#endif
 #endif
 
 #if defined(USE_OZONE) || defined(USE_X11)
   // The touch event state for X11 and Ozone based event sub-systems are based
   // on device scans that happen asynchronously. So we may need to attach an
   // observer to wait until these scans complete.
   if (ui::InputDeviceManager::GetInstance()->AreDeviceListsComplete()) {
     RecordTouchEventState();
   } else {
     input_device_event_observer_.reset(
@@ skipping 52 matching lines @@
   }
 }
 
 namespace chrome {
 
 void AddMetricsExtraParts(ChromeBrowserMainParts* main_parts) {
   main_parts->AddParts(new ChromeBrowserMainExtraPartsMetrics());
 }
 
 }  // namespace chrome