Condition ::RecordLinuxDistro against OS_LINUX, not USE_X11

Condition ::RecordLinuxDistro against OS_LINUX, not USE_X11

There is nothing that makes ::RecordLinuxDistro X11 specific. Still
it gets declared guarded by USE_OZONE and called guarded by USE_X11.

CL syncs up the declaration and call sites, and fixes the OzoneLinux
FYI bot.

BUG=295089

[tonikitoo, 2017-06-01 03:00:10]

The CQ bit was checked by tonikitoo@igalia.com to run a CQ dry run

[commit-bot: I haz the power, 2017-06-01 03:00:28]

Dry run: CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[tonikitoo, 2017-06-01 03:00:38]

tonikitoo@igalia.com changed reviewers:
+ thestig@chromium.org

[commit-bot: I haz the power, 2017-06-01 03:50:29]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-06-01 03:50:30]

Dry run: This issue passed the CQ dry run.

[Lei Zhang, 2017-06-01 04:27:09]

https://codereview.chromium.org/2918663004/diff/1/chrome/browser/metrics/chro...
File chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc (left):

https://codereview.chromium.org/2918663004/diff/1/chrome/browser/metrics/chro...
chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc:467: #if
defined(USE_X11) && !defined(OS_CHROMEOS)
This matches the #if that surrounds GetLinuxWindowManager().

Do you want to break this up into two #if blocks?

[tonikitoo, 2017-06-01 11:51:52]

On 2017/06/01 04:27:09, Lei Zhang wrote:
>
https://codereview.chromium.org/2918663004/diff/1/chrome/browser/metrics/chro...
> File chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc (left):
> 
>
https://codereview.chromium.org/2918663004/diff/1/chrome/browser/metrics/chro...
> chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc:467: #if
> defined(USE_X11) && !defined(OS_CHROMEOS)
> This matches the #if that surrounds GetLinuxWindowManager().
> 
> Do you want to break this up into two #if blocks?

You are obviously right - and it was my fault to not amend the rest of the fix.

Actually, GetLinuxWindowManager should be under the same guard as
RecordLinuxDistro.

[tonikitoo, 2017-06-01 11:59:08]

On 2017/06/01 11:51:52, tonikitoo wrote:
> On 2017/06/01 04:27:09, Lei Zhang wrote:
> >
>
https://codereview.chromium.org/2918663004/diff/1/chrome/browser/metrics/chro...
> > File chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
(left):
> > 
> >
>
https://codereview.chromium.org/2918663004/diff/1/chrome/browser/metrics/chro...
> > chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc:467: #if
> > defined(USE_X11) && !defined(OS_CHROMEOS)
> > This matches the #if that surrounds GetLinuxWindowManager().
> > 
> > Do you want to break this up into two #if blocks?
> 
> You are obviously right - and it was my fault to not amend the rest of the
fix.
> 
> Actually, GetLinuxWindowManager should be under the same guard as
> RecordLinuxDistro.

Still, the patchset #2 does not build yet because ui::GuessWindowManager() is
defined in //ui/base/x/x11_util.cc / h. This is a linux specific method, not
x11.

https://cs.chromium.org/chromium/src/ui/base/x/x11_util.cc?type=cs&q=GuessWin...

Possible solutions:

1) move this method and its declaration to a different file in ui/base, out of
//ui/base/x/.

2) Guard the call sites in
chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc under USE_X11
rather than OS_LINUX.

wdyt?

[timbrown, 2017-06-01 16:33:08]

On 2017/06/01 11:59:08, tonikitoo wrote:
> On 2017/06/01 11:51:52, tonikitoo wrote:
> > On 2017/06/01 04:27:09, Lei Zhang wrote:
> > >
> >
>
https://codereview.chromium.org/2918663004/diff/1/chrome/browser/metrics/chro...
> > > File chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
> (left):
> > > 
> > >
> >
>
https://codereview.chromium.org/2918663004/diff/1/chrome/browser/metrics/chro...
> > > chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc:467: #if
> > > defined(USE_X11) && !defined(OS_CHROMEOS)
> > > This matches the #if that surrounds GetLinuxWindowManager().
> > > 
> > > Do you want to break this up into two #if blocks?
> > 
> > You are obviously right - and it was my fault to not amend the rest of the
> fix.
> > 
> > Actually, GetLinuxWindowManager should be under the same guard as
> > RecordLinuxDistro.
> 
> Still, the patchset #2 does not build yet because ui::GuessWindowManager() is
> defined in //ui/base/x/x11_util.cc / h. This is a linux specific method, not
> x11.
> 
>
https://cs.chromium.org/chromium/src/ui/base/x/x11_util.cc?type=cs&q=GuessWin...
> 
> Possible solutions:
> 
> 1) move this method and its declaration to a different file in ui/base, out of
> //ui/base/x/.
> 
> 2) Guard the call sites in
> chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc under
USE_X11
> rather than OS_LINUX.
> 
> wdyt?

Thanks for this CL. I actually have another CL to fix the Ozone build
(https://codereview.chromium.org/2917483002/). It's taking the approach of
splitting the code into two #if blocks.

If you feel it is better to move the window manager stuff out of X, feel free to
do it and make your case, I just wanted to fix the ozone build asap.

[Lei Zhang, 2017-06-01 19:12:20]

https://codereview.chromium.org/2917483002/ already landed, so you probably need
to rebase. We can continue and tweak this more as needed.