diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-11 16:50:05 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-11 16:50:05 +0000 |
| commit | 45df03fa72c3c427dc219260eeaec624b626c2cf (patch) | |
| tree | bece5151b17c618169c4c5511b3942015f9ebd9d /content/test/DEPS | |
| parent | f15d20675fad643cd0b2ae039e2993ab056b874b (diff) | |
| download | chromium_src-45df03fa72c3c427dc219260eeaec624b626c2cf.zip chromium_src-45df03fa72c3c427dc219260eeaec624b626c2cf.tar.gz chromium_src-45df03fa72c3c427dc219260eeaec624b626c2cf.tar.bz2 | |
Reland r161256: Fix the crash that was happening on the buildbot (but not trybots, for a strange reason) because ResourceBundle was initialized twice for tests that use the RenderViewTest harness.
The one difference is to check if ResourceBundle is initialized before initializing it. This is needed because on content_browsertests it's not initialized while in browser_tests it is. We can't make the two browser test binaries behave the same because of differences in how chrome's browser_tests and unit_tests can share the same test suite while in content that's not possible.
TBR=cpu
Review URL: https://codereview.chromium.org/11091058
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161361 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test/DEPS')
| -rw-r--r-- | content/test/DEPS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/content/test/DEPS b/content/test/DEPS index 3227a5e..9c61f8f 100644 --- a/content/test/DEPS +++ b/content/test/DEPS @@ -4,4 +4,5 @@ include_rules = [ "+media/base", # For ChannelLayout in WebRTC tests. "+ui/aura/test/test_aura_initializer.h", "+ui/base/resource/data_pack.h", + "+ui/base/resource/resource_bundle.h", ] |