diff options
| author | vivek.vg <vivek.vg@samsung.com> | 2014-09-16 08:24:32 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-16 15:26:02 +0000 |
| commit | a5827f8eef9041dd95fa1268694d625e7a8c5631 (patch) | |
| tree | 81fbc547f680bfcd1e4895b19992564b81240084 /content/content_browsertests.isolate | |
| parent | 087ba0b26bd0814bfd627b92c8e936270fd4a88b (diff) | |
| download | chromium_src-a5827f8eef9041dd95fa1268694d625e7a8c5631.zip chromium_src-a5827f8eef9041dd95fa1268694d625e7a8c5631.tar.gz chromium_src-a5827f8eef9041dd95fa1268694d625e7a8c5631.tar.bz2 | |
Utilize TestContentClient in RenderViewTest as resources are being migrated to using grd system.
Blink is about to use blink_resources.grd for the inline resources of user agent stylesheets.
This removes the dependency upon using make-file-arrays.py which embeds these resources as strings.
This patch instantiates TestContentClient which does all the plumbing required for various test targets in content.
As the resources are being moved into blink_resources.grd, this generates blink_resources.pak.
This pak doesn't exists as a separate pak file but its repacked into "content_shell.pak".
This blink side changes were reverted here https://codereview.chromium.org/567073004/
The reason for reverting: Breaking quite a few browser_tests and content_browsertests across multiple platforms.
BUG=312586
Review URL: https://codereview.chromium.org/567153002
Cr-Commit-Position: refs/heads/master@{#295071}
Diffstat (limited to 'content/content_browsertests.isolate')
| -rw-r--r-- | content/content_browsertests.isolate | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/content/content_browsertests.isolate b/content/content_browsertests.isolate index 8532aa1..c3e0a2a 100644 --- a/content/content_browsertests.isolate +++ b/content/content_browsertests.isolate @@ -10,6 +10,20 @@ ], }, }], + ['chromeos==1', { + 'variables': { + 'isolate_dependency_tracked': [ + '<(PRODUCT_DIR)/content_shell.pak', + ], + }, + }], + ['OS=="mac"', { + 'variables': { + 'isolate_dependency_tracked': [ + '<(PRODUCT_DIR)/content_shell.pak', + ], + }, + }], ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'isolate_dependency_untracked': [ |