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

Unified Diff: chrome/test/unit/chrome_test_suite.h

Issue 28185: properly initialize resource manager on mac for unittests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 10 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
Index: chrome/test/unit/chrome_test_suite.h
===================================================================
--- chrome/test/unit/chrome_test_suite.h (revision 10460)
+++ chrome/test/unit/chrome_test_suite.h (working copy)
@@ -16,10 +16,7 @@
#include "chrome/browser/browser_process.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
-#if defined(OS_WIN) || defined(OS_LINUX)
-// TODO(port): Remove the #ifdef when ResourceBundle is ported.
#include "chrome/common/resource_bundle.h"
-#endif
#include "chrome/test/testing_browser_process.h"
class ChromeTestSuite : public TestSuite {
@@ -50,14 +47,10 @@
if (!user_data_dir.empty())
PathService::Override(chrome::DIR_USER_DATA, user_data_dir);
-#if defined(OS_WIN) || defined(OS_LINUX)
- // TODO(port): Remove the #ifdef when ResourceBundle is ported.
- //
// Force unittests to run using en-us so if we test against string
// output, it'll pass regardless of the system language.
ResourceBundle::InitSharedInstance(L"en-us");
ResourceBundle::GetSharedInstance().LoadThemeResources();
-#endif
// initialize the global StatsTable for unit_tests
std::string statsfile = "unit_tests";
@@ -68,10 +61,8 @@
}
virtual void Shutdown() {
-#if defined(OS_WIN) || defined(OS_LINUX)
// TODO(port): Remove the #ifdef when ResourceBundle is ported.
ResourceBundle::CleanupSharedInstance();
-#endif
delete g_browser_process;
g_browser_process = NULL;
« chrome/common/resource_bundle_mac.mm ('K') | « chrome/common/resource_bundle_mac.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698