Turn on aura again to get performance numbers. Will revert once perf release

Turn on aura again to get performance numbers. Will revert once perf release
bots cycle.

R=ben@chromium.org
TBR=ben@chromium.org
BUG=none
TEST=none

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

[Ben Goodger (Google), 2013-02-06 17:34:45]

lgtm


On Tue, Feb 5, 2013 at 8:45 PM, <sky@chromium.org> wrote:

> Reviewers: Ben Goodger (Google),
>
> Description:
> Turn on aura again to get performance numbers. Will revert once perf
> release
> bots cycle.
>
> R=ben@chromium.org
> TBR=ben@chromium.org
> BUG=none
> TEST=none
>
>
> Please review this at
https://codereview.chromium.**org/12225037/<https://codereview.chromium.org/1...
>
> SVN Base:
svn://svn.chromium.org/chrome/**trunk/src<http://svn.chromium.org/chrome/trunk/src>
>
> Affected files:
>   M build/common.gypi
>   M chrome/test/ui/ui_test.cc
>
>
> Index: build/common.gypi
> diff --git a/build/common.gypi b/build/common.gypi
> index cc681defeab897b9fd4f8bcdb950d6**27ed957e7a..**
> 3437a9ef7338f1a0d4a5858f571246**2aad9d252e 100644
> --- a/build/common.gypi
> +++ b/build/common.gypi
> @@ -64,11 +64,11 @@
>                'use_aura%': 1,
>              }],
>
> -            # For now, Windows builds that |use_aura| should also imply
> using
> -            # ash. This rule should be removed for the future when
> Windows is
> -            # using the aura windows without the ash interface.
> -            ['use_aura==1 and OS=="win"', {
> +            # Temporarily turn on aura for windows to get perf numbers.
> Will
> +            # revert ASAP.
> +            ['OS=="win"', {
>                'use_ash%': 1,
> +              'use_aura%': 1,
>              }],
>              ['use_ash==1', {
>                'use_aura%': 1,
> Index: chrome/test/ui/ui_test.cc
> diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
> index 938f9c8e984cbebce2f7ccd3cf13a0**b3c0a7e5ef..**
> 4a42ecbc161331f512075fc88d4b67**422f054788 100644
> --- a/chrome/test/ui/ui_test.cc
> +++ b/chrome/test/ui/ui_test.cc
> @@ -205,7 +205,8 @@ void UITestBase::SetLaunchSwitches(**) {
>    }
>    if (!test_name_.empty())
>      launch_arguments_.**AppendSwitchASCII(switches::**kTestName,
> test_name_);
> -#if defined(USE_AURA)
> +  // TODO: !OS_WIN is temporary, will remove shortly.
> +#if defined(USE_AURA) && !defined(OS_WIN)
>    if (!CommandLine::**ForCurrentProcess()->**HasSwitch(
>        switches::**kDisableTestCompositor)) {
>      launch_arguments_.**AppendSwitch(switches::**kTestCompositor);
>
>
>