| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "ash/test/ash_interactive_ui_test_base.h" | 5 #include "ash/test/ash_interactive_ui_test_base.h" |
| 6 | 6 |
| 7 #include "base/path_service.h" | 7 #include "base/path_service.h" |
| 8 #include "ui/aura/env.h" | 8 #include "ui/aura/env.h" |
| 9 #include "ui/base/resource/resource_bundle.h" | 9 #include "ui/base/resource/resource_bundle.h" |
| 10 #include "ui/base/ui_base_paths.h" | 10 #include "ui/base/ui_base_paths.h" |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 | 22 |
| 23 ui::RegisterPathProvider(); | 23 ui::RegisterPathProvider(); |
| 24 ui::ResourceBundle::InitSharedInstanceWithLocale( | 24 ui::ResourceBundle::InitSharedInstanceWithLocale( |
| 25 "en-US", NULL, ui::ResourceBundle::LOAD_COMMON_RESOURCES); | 25 "en-US", NULL, ui::ResourceBundle::LOAD_COMMON_RESOURCES); |
| 26 base::FilePath resources_pack_path; | 26 base::FilePath resources_pack_path; |
| 27 PathService::Get(base::DIR_MODULE, &resources_pack_path); | 27 PathService::Get(base::DIR_MODULE, &resources_pack_path); |
| 28 resources_pack_path = | 28 resources_pack_path = |
| 29 resources_pack_path.Append(FILE_PATH_LITERAL("resources.pak")); | 29 resources_pack_path.Append(FILE_PATH_LITERAL("resources.pak")); |
| 30 ResourceBundle::GetSharedInstance().AddDataPackFromPath( | 30 ResourceBundle::GetSharedInstance().AddDataPackFromPath( |
| 31 resources_pack_path, ui::SCALE_FACTOR_NONE); | 31 resources_pack_path, ui::SCALE_FACTOR_NONE); |
| 32 aura::Env::CreateInstance(true); | 32 env_ = aura::Env::CreateInstance(); |
| 33 | 33 |
| 34 test::AshTestBase::SetUp(); | 34 test::AshTestBase::SetUp(); |
| 35 } | 35 } |
| 36 | 36 |
| 37 void AshInteractiveUITestBase::TearDown() { | 37 void AshInteractiveUITestBase::TearDown() { |
| 38 test::AshTestBase::TearDown(); | 38 test::AshTestBase::TearDown(); |
| 39 aura::Env::DeleteInstance(); | 39 env_.reset(); |
| 40 } | 40 } |
| 41 | 41 |
| 42 } // namespace test | 42 } // namespace test |
| 43 } // namespace ash | 43 } // namespace ash |
| OLD | NEW |