mac: Swizzle out +[NSBundle mainBundle] for in process browser tests.

chrome/test/base/in_process_browser_test.cc

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..ba8f460046ec968247bf17aacac2beb89801d219 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)
@@ -230,6 +231,8 @@ void InProcessBrowserTest::SetUp() {
   // anything sensitive gets stored, including Cookies).  Without this,
   // many tests will hang waiting for a user to approve KeyChain access.
   OSCrypt::UseMockKeychain(true);
+
+  bundle_swizzler_.reset(new ScopedBundleSwizzlerMac);
 #endif
 
 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
@@ -374,6 +377,11 @@ void InProcessBrowserTest::TearDown() {
 #if defined(OS_WIN)
   com_initializer_.reset();
 #endif
+
+#if defined(OS_MACOSX)
+  bundle_swizzler_.reset();

[Robert Sesek, 2015/06/26 22:36:54]

Does this need to be done between each test, or can this be done in the
ctor/dtor?

[erikchen, 2015/06/26 23:14:52]

I'm generally prefer to keep all light-weight configuration in test
setup/teardown. That being said, I don't care enough to debate this point.

+#endif
+
   BrowserTestBase::TearDown();
 }