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

Unified Diff: chrome/test/base/in_process_browser_test.cc

Issue 1211213003: mac: Swizzle out +[NSBundle mainBundle] for in process browser tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove blank line. Created 5 years, 5 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/base/in_process_browser_test.cc
diff --git a/chrome/test/base/in_process_browser_test.cc b/chrome/test/base/in_process_browser_test.cc
index cb63fb1464cc312a393a082090aa012a62868974..2ee8c81231817fb77b3bafcb5c6bce35426edf8f 100644
--- a/chrome/test/base/in_process_browser_test.cc
+++ b/chrome/test/base/in_process_browser_test.cc
@@ -54,6 +54,7 @@
#if defined(OS_MACOSX)
#include "base/mac/scoped_nsautorelease_pool.h"
+#include "chrome/test/base/scoped_bundle_swizzler_mac.h"
#endif
#if defined(OS_WIN)
@@ -186,6 +187,10 @@ InProcessBrowserTest::InProcessBrowserTest()
// ContentMain. However that is after tests' constructors or SetUp methods,
// which sometimes need it. So just override it.
CHECK(PathService::Override(chrome::DIR_TEST_DATA, test_data_dir));
+
+#if defined(OS_MACOSX)
+ bundle_swizzler_.reset(new ScopedBundleSwizzlerMac);
+#endif
}
InProcessBrowserTest::~InProcessBrowserTest() {

Powered by Google App Engine
This is Rietveld 408576698