Consolidate Browser Creation.

chrome/browser/ui/tabs/pinned_tab_service_unittest.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 <string>
 #include <vector>
 
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/tabs/pinned_tab_codec.h"
@@ skipping 34 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(PinnedTabServiceTest);
 };
 
 // Makes sure closing a popup triggers writing pinned tabs.
 TEST_F(PinnedTabServiceTest, Popup) {
   GURL url("http://www.google.com");
   AddTab(browser(), url);
   browser()->tab_strip_model()->SetTabPinned(0, true);
 
   // Create a popup.
-  scoped_ptr<Browser> popup(new Browser(Browser::TYPE_POPUP, profile()));
-  scoped_ptr<TestBrowserWindow> popup_window(
-      new TestBrowserWindow(popup.get()));
-  popup->SetWindowForTesting(popup_window.get());
+  Browser::CreateParams params(Browser::TYPE_POPUP, profile());
+  scoped_ptr<Browser> popup(
+      chrome::CreateBrowserWithTestWindowForParams(&params));
 
   // Close the browser. This should trigger saving the tabs. No need to destroy
   // the browser (this happens automatically in the test destructor).
   browser()->OnWindowClosing();
 
   std::string result = PinnedTabTestUtils::TabsToString(
       PinnedTabCodec::ReadPinnedTabs(profile()));
   EXPECT_EQ("http://www.google.com/::pinned:", result);
 
   // Close the popup. This shouldn't reset the saved state.
   chrome::CloseAllTabs(popup.get());
   popup.reset(NULL);
-  popup_window.reset(NULL);
 
   // Check the state to make sure it hasn't changed.
   result = PinnedTabTestUtils::TabsToString(
       PinnedTabCodec::ReadPinnedTabs(profile()));
   EXPECT_EQ("http://www.google.com/::pinned:", result);
 }
 
 }  // namespace