diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-07 21:09:58 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-07 21:09:58 +0000 |
| commit | 22735af65d1f55a2eec8c95c1b87fe7f608a1dc6 (patch) | |
| tree | 2dc5126911090a7c891515e20e9952a4f4a031f1 /chrome/test/in_process_browser_test.cc | |
| parent | 12adfaa77882b5049465b2d32e16d23c1f349e2f (diff) | |
| download | chromium_src-22735af65d1f55a2eec8c95c1b87fe7f608a1dc6.zip chromium_src-22735af65d1f55a2eec8c95c1b87fe7f608a1dc6.tar.gz chromium_src-22735af65d1f55a2eec8c95c1b87fe7f608a1dc6.tar.bz2 | |
Re-land popup routing fix for browser.
Just the bugfix + test now. Test is disabled pending a working framework.
http://crbug.com/8472
Review URL: http://codereview.chromium.org/59007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13282 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/in_process_browser_test.cc')
| -rw-r--r-- | chrome/test/in_process_browser_test.cc | 15 |
1 files changed, 12 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, |