| Index: ui/test/test_suite.cc
|
| diff --git a/ui/test/test_suite.cc b/ui/test/test_suite.cc
|
| index 06e0d3517b18784579745289a26c845f5b6fe695..832a1eae94f4c9731a90ca4b72891dd81844a4ba 100644
|
| --- a/ui/test/test_suite.cc
|
| +++ b/ui/test/test_suite.cc
|
| @@ -12,7 +12,7 @@
|
| #include "ui/base/ui_base_paths.h"
|
| #include "ui/gfx/gfx_paths.h"
|
|
|
| -#if defined(OS_MACOSX)
|
| +#if defined(OS_MACOSX) && !defined(OS_IOS)
|
| #include "base/mac/bundle_locations.h"
|
| #endif
|
|
|
| @@ -27,7 +27,7 @@ void UITestSuite::Initialize() {
|
| ui::RegisterPathProvider();
|
| gfx::RegisterPathProvider();
|
|
|
| -#if defined(OS_MACOSX)
|
| +#if defined(OS_MACOSX) && !defined(OS_IOS)
|
| // Look in the framework bundle for resources.
|
| // TODO(port): make a resource bundle for non-app exes. What's done here
|
| // isn't really right because this code needs to depend on chrome_dll
|
| @@ -51,7 +51,7 @@ void UITestSuite::Initialize() {
|
| pak_dir = pak_dir.AppendASCII("ui_unittests_strings");
|
| PathService::Override(ui::DIR_LOCALES, pak_dir);
|
| #endif // defined(OS_ANDROID)
|
| -#endif // defined(OS_MACOSX)
|
| +#endif // defined(OS_MACOSX) && !defined(OS_IOS)
|
|
|
| // Force unittests to run using en-US so if we test against string
|
| // output, it'll pass regardless of the system language.
|
| @@ -67,7 +67,7 @@ void UITestSuite::Initialize() {
|
| void UITestSuite::Shutdown() {
|
| ui::ResourceBundle::CleanupSharedInstance();
|
|
|
| -#if defined(OS_MACOSX)
|
| +#if defined(OS_MACOSX) && !defined(OS_IOS)
|
| base::mac::SetOverrideFrameworkBundle(NULL);
|
| #endif
|
| base::TestSuite::Shutdown();
|
|
|