Move the gyp variables used for grit defines on android to actually work.

Move the gyp variables used for grit defines on android to actually work.

The enable_themes and enable_extensions gyp variables were in a different
scope that prevented the grit_defines from having the correct value when
evaluating the condition.  Moves the variable assignment into the same
scope as the variable declaration and now everything is happy.

TEST=touch chrome/browser/browser_resources.grd && \
     make chrome_resources (check about_version does not have theme icon)

BUG=


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=152455

[Yaron, 2012-08-20 21:39:58]

This seems fine but how did you identify just these two? I'm wondering if there
are other definitions at the wrong scope (it's not immediately obvious to me)

[Ted C, 2012-08-20 21:58:57]

On 2012/08/20 21:39:58, Yaron wrote:
> This seems fine but how did you identify just these two? I'm wondering if
there
> are other definitions at the wrong scope (it's not immediately obvious to me)

It should be for all the variables used to determine grit_defines, so I did a
`git grep 'grit_defines'` and looked for all the variables used to determine
those (I missed enable_printing the first round until I double checked this).

[Yaron, 2012-08-20 22:20:46]

lgtm (I'm assuming you've verified that moving these hasn't affected the
relevant C++ defines due to scoping changes)

[Ted C, 2012-08-20 22:55:14]

On 2012/08/20 22:20:46, Yaron wrote:
> lgtm (I'm assuming you've verified that moving these hasn't affected the
> relevant C++ defines due to scoping changes)

Indeed, I checked that setting enabled_themes in that block to 1, results
ENABLE_THEMES being set, while 0 (Android's value) does not set that define in
chrome/browser.target.mk

[Nico, 2012-08-20 22:56:39]

lgtm

[commit-bot: I haz the power, 2012-08-20 23:18:01]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tedchoc@chromium.org/10828396/4001

[commit-bot: I haz the power, 2012-08-21 00:50:47]

Change committed as 152455