diff options
| author | oshima <oshima@chromium.org> | 2015-07-31 10:07:43 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-31 17:08:28 +0000 |
| commit | 5cab2295d1351b338440632bd191d8c307699ab7 (patch) | |
| tree | 13a0946b9714b0c5186f1edaf8750a30226709f3 /ash/test/ash_test_helper.cc | |
| parent | e160f6be485deabcb4725d7e3623ae18ef5aee48 (diff) | |
| download | chromium_src-5cab2295d1351b338440632bd191d8c307699ab7.zip chromium_src-5cab2295d1351b338440632bd191d8c307699ab7.tar.gz chromium_src-5cab2295d1351b338440632bd191d8c307699ab7.tar.bz2 | |
Reset the start value of the synthesized display ids
So that it won't go over 255. This is speculative fix for failures on valgrind bot
BUG=None
TBR=mukai@chromium.org, thestig@chromium.org
Review URL: https://codereview.chromium.org/1271483004
Cr-Commit-Position: refs/heads/master@{#341355}
Diffstat (limited to 'ash/test/ash_test_helper.cc')
| -rw-r--r-- | ash/test/ash_test_helper.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc index 60a3a31..22f16bb 100644 --- a/ash/test/ash_test_helper.cc +++ b/ash/test/ash_test_helper.cc @@ -6,6 +6,7 @@ #include "ash/accelerators/accelerator_controller.h" #include "ash/ash_switches.h" +#include "ash/display/display_info.h" #include "ash/shell.h" #include "ash/shell_init_params.h" #include "ash/test/ash_test_views_delegate.h" @@ -60,6 +61,7 @@ AshTestHelper::~AshTestHelper() { } void AshTestHelper::SetUp(bool start_session) { + ResetDisplayIdForTest(); views_delegate_.reset(new AshTestViewsDelegate); // Disable animations during tests. |