| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "athena/env/public/athena_env.h" | 5 #include "athena/env/public/athena_env.h" |
| 6 | 6 |
| 7 #include "athena/test/athena_test_base.h" | 7 #include "athena/test/base/athena_test_base.h" |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "ui/gfx/display.h" | 9 #include "ui/gfx/display.h" |
| 10 #include "ui/gfx/screen.h" | 10 #include "ui/gfx/screen.h" |
| 11 | 11 |
| 12 namespace athena { | 12 namespace athena { |
| 13 | 13 |
| 14 typedef test::AthenaTestBase AthenaEnvTest; | 14 typedef test::AthenaTestBase AthenaEnvTest; |
| 15 | 15 |
| 16 namespace { | 16 namespace { |
| 17 | 17 |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 121 DISALLOW_COPY_AND_ASSIGN(AthenaShutdownTest); | 121 DISALLOW_COPY_AND_ASSIGN(AthenaShutdownTest); |
| 122 }; | 122 }; |
| 123 | 123 |
| 124 } // namespace | 124 } // namespace |
| 125 | 125 |
| 126 // gfx::Screen should be accessible after shutdown. | 126 // gfx::Screen should be accessible after shutdown. |
| 127 TEST_F(AthenaShutdownTest, Shutdown) { | 127 TEST_F(AthenaShutdownTest, Shutdown) { |
| 128 } | 128 } |
| 129 | 129 |
| 130 } // namespace athena | 130 } // namespace athena |
| OLD | NEW |