1 files changed, 11 insertions, 0 deletions
diff --git a/chrome/test/in_process_browser_test.cc b/chrome/test/in_process_browser_test.cc
index 4c68f57..1b454a3 100644
--- a/chrome/test/in_process_browser_test.cc
+++ b/chrome/test/in_process_browser_test.cc
@@ -44,6 +44,15 @@ bool DieFileDie(const std::wstring& file, bool recurse) {
   return false;
 }
 
+class ShadowingAtExitManager : public base::AtExitManager {
+ public:
+  ShadowingAtExitManager() : base::AtExitManager(true) {}
+  virtual ~ShadowingAtExitManager() {}
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(ShadowingAtExitManager);
+};
+
 }  // namespace
 
 InProcessBrowserTest::InProcessBrowserTest()
@@ -55,6 +64,8 @@ InProcessBrowserTest::InProcessBrowserTest()
 }
 
 void InProcessBrowserTest::SetUp() {
+  ShadowingAtExitManager at_exit_manager;
+
   // Cleanup the user data dir.
   std::wstring user_data_dir;
   PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);