From 22735af65d1f55a2eec8c95c1b87fe7f608a1dc6 Mon Sep 17 00:00:00 2001
From: "ben@chromium.org"
 <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 7 Apr 2009 21:09:58 +0000
Subject: 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
---
 chrome/test/in_process_browser_test.cc | 15 ++++++++++++---
 chrome/test/unit/unittests.vcproj      |  4 ++++
 2 files changed, 16 insertions(+), 3 deletions(-)

(limited to 'chrome/test')

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>
-- 
cgit v1.1