diff options
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/in_process_browser_test.cc | 15 | ||||
| -rw-r--r-- | chrome/test/unit/unittests.vcproj | 4 |
2 files changed, 16 insertions, 3 deletions
diff --git a/chrome/test/in_process_browser_test.cc b/chrome/test/in_process_browser_test.cc index a9fa5c4..39114ee 100644 --- a/chrome/test/in_process_browser_test.cc +++ b/chrome/test/in_process_browser_test.cc @@ -43,6 +43,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() @@ -54,6 +63,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); @@ -163,7 +174,7 @@ Browser* InProcessBrowserTest::CreateBrowser(Profile* profile) { Browser* browser = Browser::Create(profile); browser->AddTabWithURL( - GURL("about:blank"), GURL(), PageTransition::START_PAGE, true, NULL); + GURL("about:blank"), GURL(), PageTransition::START_PAGE, true, -1, NULL); // Wait for the page to finish loading. ui_test_utils::WaitForNavigation( @@ -190,8 +201,6 @@ void InProcessBrowserTest::RunTestOnMainThreadLoop() { return; } - profile->InitExtensions(); - browser_ = CreateBrowser(profile); registrar_.Add(this, diff --git a/chrome/test/unit/unittests.vcproj b/chrome/test/unit/unittests.vcproj index d4e3864..947f797 100644 --- a/chrome/test/unit/unittests.vcproj +++ b/chrome/test/unit/unittests.vcproj @@ -428,6 +428,10 @@ > </File> <File + RelativePath="..\..\browser\browser_unittest.cc" + > + </File> + <File RelativePath="..\..\browser\chrome_thread_unittest.cc" > </File> |