| Index: ui/test/ui_test_initializer.cc
|
| diff --git a/ui/aura/test/test_aura_initializer.cc b/ui/test/ui_test_initializer.cc
|
| similarity index 65%
|
| rename from ui/aura/test/test_aura_initializer.cc
|
| rename to ui/test/ui_test_initializer.cc
|
| index c336eb44d2ede99a00bc2bd4a04d26353cca6767..b1555531c718e14cd0cbe6cc720e7aa85eb7f971 100644
|
| --- a/ui/aura/test/test_aura_initializer.cc
|
| +++ b/ui/test/ui_test_initializer.cc
|
| @@ -2,26 +2,25 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "ui/aura/test/test_aura_initializer.h"
|
| +#include "ui/test/ui_test_initializer.h"
|
|
|
| #include "base/base_paths.h"
|
| #include "base/path_service.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
|
|
| -namespace aura {
|
| +namespace ui {
|
| namespace test {
|
|
|
| -TestAuraInitializer::TestAuraInitializer() {
|
| +UITestInitializer::UITestInitializer() {
|
| base::FilePath pak_file;
|
| PathService::Get(base::DIR_MODULE, &pak_file);
|
| - pak_file = pak_file.Append(FILE_PATH_LITERAL(
|
| - "aura_test_support_resources.pak"));
|
| + pak_file = pak_file.Append(FILE_PATH_LITERAL("ui.pak"));
|
| ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file);
|
| }
|
|
|
| -TestAuraInitializer::~TestAuraInitializer() {
|
| +UITestInitializer::~UITestInitializer() {
|
| ui::ResourceBundle::CleanupSharedInstance();
|
| }
|
|
|
| } // namespace test
|
| -} // namespace aura
|
| +} // namespace ui
|
|
|