| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 #ifndef APP_TEST_SUITE_H_ | 5 #ifndef APP_TEST_SUITE_H_ |
| 6 #define APP_TEST_SUITE_H_ | 6 #define APP_TEST_SUITE_H_ |
| 7 | 7 |
| 8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
| 9 | 9 |
| 10 #include <string> | 10 #include <string> |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 45 path = path.AppendASCII("Chromium Framework.framework"); | 45 path = path.AppendASCII("Chromium Framework.framework"); |
| 46 #else | 46 #else |
| 47 #error Unknown branding | 47 #error Unknown branding |
| 48 #endif | 48 #endif |
| 49 mac_util::SetOverrideAppBundlePath(path); | 49 mac_util::SetOverrideAppBundlePath(path); |
| 50 #endif // OS_MACOSX | 50 #endif // OS_MACOSX |
| 51 | 51 |
| 52 // Force unittests to run using en-US so if we test against string | 52 // Force unittests to run using en-US so if we test against string |
| 53 // output, it'll pass regardless of the system language. | 53 // output, it'll pass regardless of the system language. |
| 54 ResourceBundle::InitSharedInstance(L"en-US"); | 54 ResourceBundle::InitSharedInstance(L"en-US"); |
| 55 ResourceBundle::GetSharedInstance().LoadThemeResources(); | |
| 56 } | 55 } |
| 57 | 56 |
| 58 virtual void Shutdown() { | 57 virtual void Shutdown() { |
| 59 ResourceBundle::CleanupSharedInstance(); | 58 ResourceBundle::CleanupSharedInstance(); |
| 60 | 59 |
| 61 #if defined(OS_MACOSX) | 60 #if defined(OS_MACOSX) |
| 62 mac_util::SetOverrideAppBundle(NULL); | 61 mac_util::SetOverrideAppBundle(NULL); |
| 63 #endif | 62 #endif |
| 64 TestSuite::Shutdown(); | 63 TestSuite::Shutdown(); |
| 65 } | 64 } |
| 66 }; | 65 }; |
| 67 | 66 |
| 68 #endif // APP_TEST_SUITE_H_ | 67 #endif // APP_TEST_SUITE_H_ |
| OLD | NEW |