| Index: ash/test/ash_test_base.cc
|
| ===================================================================
|
| --- ash/test/ash_test_base.cc (revision 182530)
|
| +++ ash/test/ash_test_base.cc (working copy)
|
| @@ -137,9 +137,6 @@
|
| metro_viewer_host_.reset();
|
| #endif
|
| event_generator_.reset();
|
| - // Some tests set an internal display id,
|
| - // reset it here, so other tests will continue in a clean environment.
|
| - gfx::Display::SetInternalDisplayId(gfx::Display::kInvalidDisplayID);
|
| }
|
|
|
| aura::test::EventGenerator& AshTestBase::GetEventGenerator() {
|
|
|
| Property changes on: ash/test/ash_test_base.cc
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
|
|
|
|