untangle pango usage from use_x11 and OS==linux

untangle pango usage from use_x11 and OS==linux

This allows pango to be toggled independently of X11 and linux. It defaults 
to enabled on these.

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=201892

[Mostyn Bramley-Moore, 2013-05-13 19:51:30]

This is an updated version of https://codereview.chromium.org/14181002/
(submitted by spang).

Added jam & brettw to review content/*
Added ben to review ui/*

[Ben Goodger (Google), 2013-05-14 16:52:29]

ui lgtm

[brettw, 2013-05-21 18:05:24]

content lgtm. In the future, please only add one owners reviewer per area to cut
down on codereview spam.

[Mostyn Bramley-Moore, 2013-05-21 18:09:47]

On 2013/05/21 18:05:24, brettw wrote:
> content lgtm. In the future, please only add one owners reviewer per area to
cut
> down on codereview spam.

Will do- sorry.

Can you give build/common.gypi the thumbs-up too?

[Paweł Hajdan Jr., 2013-05-22 19:41:13]

build/common.gypi LGTM

Thanks for the change!

[commit-bot: I haz the power, 2013-05-22 19:43:40]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/mostynb@opera.com/15102010/1

[commit-bot: I haz the power, 2013-05-22 19:43:44]

Failed to apply patch for ui/ui_unittests.gypi:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file ui/ui_unittests.gypi
  Hunk #1 FAILED at 209.
  Hunk #2 succeeded at 235 (offset -1 lines).
  Hunk #3 succeeded at 259 (offset -1 lines).
  1 out of 3 hunks FAILED -- saving rejects to file ui/ui_unittests.gypi.rej

Patch:       ui/ui_unittests.gypi
Index: ui/ui_unittests.gypi
diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi
index
7b8887a695c0d03e9519f7b636a03ab7dec28d13..9bb8bdcce82ba5610244fcc40abcb81d42f9d3f3
100644
--- a/ui/ui_unittests.gypi
+++ b/ui/ui_unittests.gypi
@@ -209,12 +209,6 @@
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [ 4267, ],
         }],
-        ['OS == "linux"', {
-          'sources': [
-            'base/x/x11_util_unittest.cc',
-            'gfx/platform_font_pango_unittest.cc',
-          ],
-        }],
         ['OS == "linux" and toolkit_views==1', {
           'sources': [
             'base/x/events_x_unittest.cc',
@@ -236,10 +230,13 @@
             'base/strings/ui_strings.gyp:ui_unittest_strings',
           ],
         }],
-        ['use_glib == 1', {
+        ['use_pango == 1', {
           'dependencies': [
             '../build/linux/system.gyp:pangocairo',
           ],
+          'sources': [
+            'gfx/platform_font_pango_unittest.cc',
+          ],
           'conditions': [
             ['linux_use_tcmalloc==1', {
                'dependencies': [
@@ -257,6 +254,9 @@
           'dependencies': [
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
+          'sources': [
+            'base/x/x11_util_unittest.cc',
+          ],
         }],
         ['toolkit_uses_gtk == 1', {
           'sources': [

[commit-bot: I haz the power, 2013-05-22 19:55:01]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/mostynb@opera.com/15102010/9001

[commit-bot: I haz the power, 2013-05-22 21:31:11]

Sorry for I got bad news for ya.
Compile failed with a clobber build on linux_chromeos.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_chro...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[Mostyn Bramley-Moore, 2013-05-22 21:37:42]

Patch set 3 removed some stray test inclusion from ui/ui_unittests.gypi (which
was accidentally introduced in the rebase in patch set 2).

[commit-bot: I haz the power, 2013-05-22 21:39:05]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/mostynb@opera.com/15102010/24002

[commit-bot: I haz the power, 2013-05-23 11:43:05]

Retried try job too often on win7_aura for step(s) content_browsertests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win7_aura&...

[commit-bot: I haz the power, 2013-05-23 17:22:38]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/mostynb@opera.com/15102010/24002

[commit-bot: I haz the power, 2013-05-23 21:44:16]

Change committed as 201892