Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(52)

Unified Diff: ui/test/test_suite.cc

Issue 10834364: Get 'all_unittests' and 'test_suite' building for iOS. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix closing define Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/test/run_all_unittests.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
« no previous file with comments | « ui/test/run_all_unittests.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698