Splits ash_test_resources_100_percent into two pak files

Splits ash_test_resources_100_percent into two pak files

One depends upon content, the other doesn't. This way ash_unittests
doesn't depend upon anything in content.

BUG=641026
TEST=test only changes
R=msw@chromium.org

Committed: https://crrev.com/abc167aee99d4f7a20452064b2ca3ab9ed7c6ff3
Cr-Commit-Position: refs/heads/master@{#416808}

[sky, 2016-09-06 22:33:00]

The CQ bit was checked by sky@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-09-06 22:33:51]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[msw, 2016-09-06 22:57:38]

https://codereview.chromium.org/2316803002/diff/1/ash/resources/BUILD.gn
File ash/resources/BUILD.gn (right):

https://codereview.chromium.org/2316803002/diff/1/ash/resources/BUILD.gn#newc...
ash/resources/BUILD.gn:83: # There is no content_200_percent as content
resources are only available at
We could generate ash_test_resources[with_]_content_200_percent.pak that simply
matches the non-content version... I'm not sure if that duplication is worth
fixing some minor odd deps/filepath inconsistencies elsewhere.

https://codereview.chromium.org/2316803002/diff/1/ash/resources/BUILD.gn#newc...
ash/resources/BUILD.gn:85: ash_test_resources("content_100_percent") {
nit: with_content_100_percent?

https://codereview.chromium.org/2316803002/diff/1/ash/test/ash_test_environme...
File ash/test/ash_test_environment.h (right):

https://codereview.chromium.org/2316803002/diff/1/ash/test/ash_test_environme...
ash/test/ash_test_environment.h:37: // Adds environment specific resources to
ResourceBundle.
Should this instead just provide a string or file path for
AuraShellTestSuite::Initialize, which can then do all the loading?

https://codereview.chromium.org/2316803002/diff/1/ash/test/ash_test_environme...
ash/test/ash_test_environment.h:38: static void AddDataPacks();
nit: maybe AddDataPacksToResourceBundle or similar?

[sky, 2016-09-06 23:23:22]

The CQ bit was checked by sky@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-09-06 23:23:57]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[sky, 2016-09-06 23:25:00]

https://codereview.chromium.org/2316803002/diff/1/ash/resources/BUILD.gn
File ash/resources/BUILD.gn (right):

https://codereview.chromium.org/2316803002/diff/1/ash/resources/BUILD.gn#newc...
ash/resources/BUILD.gn:83: # There is no content_200_percent as content
resources are only available at
On 2016/09/06 22:57:38, msw wrote:
> We could generate ash_test_resources[with_]_content_200_percent.pak that
simply
> matches the non-content version... I'm not sure if that duplication is worth
> fixing some minor odd deps/filepath inconsistencies elsewhere.

I originally did that (which is why I have AddDataPacks), but then the files are
6MBs and it seemed silly to generate the same exact file twice.

https://codereview.chromium.org/2316803002/diff/1/ash/resources/BUILD.gn#newc...
ash/resources/BUILD.gn:85: ash_test_resources("content_100_percent") {
On 2016/09/06 22:57:38, msw wrote:
> nit: with_content_100_percent?

Done.

https://codereview.chromium.org/2316803002/diff/1/ash/test/ash_test_environme...
File ash/test/ash_test_environment.h (right):

https://codereview.chromium.org/2316803002/diff/1/ash/test/ash_test_environme...
ash/test/ash_test_environment.h:37: // Adds environment specific resources to
ResourceBundle.
On 2016/09/06 22:57:38, msw wrote:
> Should this instead just provide a string or file path for
> AuraShellTestSuite::Initialize, which can then do all the loading?

I agree. I got lazy. Done.

[msw, 2016-09-06 23:30:02]

lgtm with nits

https://codereview.chromium.org/2316803002/diff/40001/ash/test/ash_test_envir...
File ash/test/ash_test_environment.h (right):

https://codereview.chromium.org/2316803002/diff/40001/ash/test/ash_test_envir...
ash/test/ash_test_environment.h:38: // Returns the ascii file name of where the
100% resources are stored at.
nit: 'ASCII', and remove 'at' for "are stored."

https://codereview.chromium.org/2316803002/diff/40001/ash/test/ash_test_envir...
File ash/test/ash_test_environment_content.cc (right):

https://codereview.chromium.org/2316803002/diff/40001/ash/test/ash_test_envir...
ash/test/ash_test_environment_content.cc:9: #include "base/files/file_path.h"
nit: cleanup these three new includes.

[sky, 2016-09-06 23:47:32]

https://codereview.chromium.org/2316803002/diff/40001/ash/test/ash_test_envir...
File ash/test/ash_test_environment.h (right):

https://codereview.chromium.org/2316803002/diff/40001/ash/test/ash_test_envir...
ash/test/ash_test_environment.h:38: // Returns the ascii file name of where the
100% resources are stored at.
On 2016/09/06 23:30:02, msw wrote:
> nit: 'ASCII', and remove 'at' for "are stored."

Done.

https://codereview.chromium.org/2316803002/diff/40001/ash/test/ash_test_envir...
File ash/test/ash_test_environment_content.cc (right):

https://codereview.chromium.org/2316803002/diff/40001/ash/test/ash_test_envir...
ash/test/ash_test_environment_content.cc:9: #include "base/files/file_path.h"
On 2016/09/06 23:30:02, msw wrote:
> nit: cleanup these three new includes.

Done.

[sky, 2016-09-06 23:47:45]

The CQ bit was checked by sky@chromium.org

[sky, 2016-09-06 23:47:46]

The patchset sent to the CQ was uploaded after l-g-t-m from msw@chromium.org
Link to the patchset: https://codereview.chromium.org/2316803002/#ps60001
(title: "feedback")

[commit-bot: I haz the power, 2016-09-06 23:47:50]

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

[commit-bot: I haz the power, 2016-09-07 00:58:04]

Committed patchset #4 (id:60001)

[commit-bot: I haz the power, 2016-09-07 01:00:16]

Description was changed from

==========
Splits ash_test_resources_100_percent into two pak files

One depends upon content, the other doesn't. This way ash_unittests
doesn't depend upon anything in content.

BUG=641026
TEST=test only changes
R=msw@chromium.org
==========

to

==========
Splits ash_test_resources_100_percent into two pak files

One depends upon content, the other doesn't. This way ash_unittests
doesn't depend upon anything in content.

BUG=641026
TEST=test only changes
R=msw@chromium.org

Committed: https://crrev.com/abc167aee99d4f7a20452064b2ca3ab9ed7c6ff3
Cr-Commit-Position: refs/heads/master@{#416808}
==========

[commit-bot: I haz the power, 2016-09-07 01:00:18]

Patchset 4 (id:??) landed as
https://crrev.com/abc167aee99d4f7a20452064b2ca3ab9ed7c6ff3
Cr-Commit-Position: refs/heads/master@{#416808}