Get 'all_unittests' and 'test_suite' building for iOS.

BUG=None.


Review URL: https://chromiumcodereview.appspot.com/10834364

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152411 0039d316-1c4b-4281-b951-d872f2087c98

ui/test/run_all_unittests.cc

@@ -2,8 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/test/main_hook.h"
 #include "ui/test/test_suite.h"
 
 int main(int argc, char** argv) {
+  MainHook hook(main, argc, argv);
   return ui::test::UITestSuite(argc, argv).Run();
 }

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();