| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "ui/aura/test/test_aura_initializer.h" | 5 #include "ui/test/ui_test_initializer.h" |
| 6 | 6 |
| 7 #include "base/base_paths.h" | 7 #include "base/base_paths.h" |
| 8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
| 9 #include "ui/base/resource/resource_bundle.h" | 9 #include "ui/base/resource/resource_bundle.h" |
| 10 | 10 |
| 11 namespace aura { | 11 namespace ui { |
| 12 namespace test { | 12 namespace test { |
| 13 | 13 |
| 14 TestAuraInitializer::TestAuraInitializer() { | 14 UITestInitializer::UITestInitializer() { |
| 15 base::FilePath pak_file; | 15 base::FilePath pak_file; |
| 16 PathService::Get(base::DIR_MODULE, &pak_file); | 16 PathService::Get(base::DIR_MODULE, &pak_file); |
| 17 pak_file = pak_file.Append(FILE_PATH_LITERAL( | 17 pak_file = pak_file.Append(FILE_PATH_LITERAL("ui.pak")); |
| 18 "aura_test_support_resources.pak")); | |
| 19 ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file); | 18 ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file); |
| 20 } | 19 } |
| 21 | 20 |
| 22 TestAuraInitializer::~TestAuraInitializer() { | 21 UITestInitializer::~UITestInitializer() { |
| 23 ui::ResourceBundle::CleanupSharedInstance(); | 22 ui::ResourceBundle::CleanupSharedInstance(); |
| 24 } | 23 } |
| 25 | 24 |
| 26 } // namespace test | 25 } // namespace test |
| 27 } // namespace aura | 26 } // namespace ui |
| OLD | NEW |