Consolidate Browser Creation.

chrome/browser/sessions/session_restore_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/first_run/first_run.h"
@@ skipping 209 matching lines @@
                                      FilePath(kTitle1File)));
   ui_test_utils::NavigateToURL(browser(), url);
 
   // Turn on session restore.
   SessionStartupPref::SetStartupPref(
       browser()->profile(),
       SessionStartupPref(SessionStartupPref::LAST));
 
   // Create a new popup.
   Profile* profile = browser()->profile();
-  Browser* popup = Browser::CreateWithParams(
-      Browser::CreateParams(Browser::TYPE_POPUP, profile));
+  Browser* popup =
+      new Browser(Browser::CreateParams(Browser::TYPE_POPUP, profile));
   popup->window()->Show();
 
   // Close the browser.
   CloseBrowserSynchronously(browser());
 
   // Create a new window, which should trigger session restore.
   ui_test_utils::BrowserAddedObserver observer;
   chrome::NewWindow(popup);
   Browser* new_browser = observer.WaitForSingleNewBrowser();
 
@@ skipping 352 matching lines @@
 IN_PROC_BROWSER_TEST_F(SessionRestoreTest, NormalAndPopup) {
   if (!browser_defaults::kRestorePopups)
     return;  // Test only applicable if restoring popups.
 
   ui_test_utils::NavigateToURL(browser(), url1_);
 
   // Make sure we have one window.
   AssertOneWindowWithOneTab(browser());
 
   // Open a popup.
-  Browser* popup = Browser::CreateWithParams(
+  Browser* popup = new Browser(
       Browser::CreateParams(Browser::TYPE_POPUP, browser()->profile()));
   popup->window()->Show();
   ASSERT_EQ(2u, BrowserList::size());
 
   ui_test_utils::NavigateToURL(popup, url1_);
 
   // Simulate an exit by shuting down the session service. If we don't do this
   // the first window close is treated as though the user closed the window
   // and won't be restored.
   SessionServiceFactory::ShutdownForProfile(browser()->profile());
@@ skipping 165 matching lines @@
   ASSERT_EQ(1u, BrowserList::size());
   ASSERT_EQ(url1_, chrome::GetActiveWebContents(new_browser)->GetURL());
   const content::NavigationController& new_controller =
       chrome::GetActiveWebContents(new_browser)->GetController();
   ASSERT_TRUE(new_controller.GetSessionStorageNamespace());
   std::string restored_session_storage_persistent_id =
       new_controller.GetSessionStorageNamespace()->persistent_id();
   EXPECT_EQ(session_storage_persistent_id,
             restored_session_storage_persistent_id);
 }