Chromium Code Reviews| Index: ash/test/ash_test_base.h |
| diff --git a/ash/test/ash_test_base.h b/ash/test/ash_test_base.h |
| index 01e05f22a0d3df8de4e5472398e5361fecf1cc81..c93451ee337b2493f74d4a1f37299f873fcc7df8 100644 |
| --- a/ash/test/ash_test_base.h |
| +++ b/ash/test/ash_test_base.h |
| @@ -46,6 +46,7 @@ class WidgetDelegate; |
| } |
| namespace ash { |
| +class AshTestImplAura; |
| class DisplayManager; |
| class SystemTray; |
| class WmShelf; |
| @@ -168,6 +169,8 @@ class AshTestBase : public testing::Test { |
| void DisableIME(); |
| private: |
| + friend class ash::AshTestImplAura; |
|
James Cook
2016/09/28 01:19:42
nit: no ash::
sky
2016/09/28 17:31:45
ash:: is necessary in this case because the curren
|
| + |
| bool setup_called_; |
| bool teardown_called_; |
| // |SetUp()| doesn't activate session if this is set to false. |