| Index: ash/test/ash_test_base.cc
|
| diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc
|
| index 128c2b9d43bc1ff0287883ac5a21c1282d07a942..5ebbb573c8453b85e6819fe2e1cc0310421d178a 100644
|
| --- a/ash/test/ash_test_base.cc
|
| +++ b/ash/test/ash_test_base.cc
|
| @@ -38,6 +38,7 @@
|
| #include "ui/display/display_switches.h"
|
| #include "ui/display/screen.h"
|
| #include "ui/display/test/display_manager_test_api.h"
|
| +#include "ui/display/types/display_constants.h"
|
| #include "ui/events/gesture_detection/gesture_configuration.h"
|
| #include "ui/gfx/geometry/point.h"
|
| #include "ui/wm/core/coordinate_conversion.h"
|
| @@ -169,7 +170,7 @@ void AshTestBase::TearDown() {
|
| event_generator_.reset();
|
| // Some tests set an internal display id,
|
| // reset it here, so other tests will continue in a clean environment.
|
| - display::Display::SetInternalDisplayId(display::Display::kInvalidDisplayID);
|
| + display::Display::SetInternalDisplayId(display::kInvalidDisplayId);
|
| }
|
|
|
| // static
|
|
|