Consolidate Browser Creation.

chrome/browser/ui/toolbar/back_forward_menu_model_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 "chrome/browser/ui/toolbar/back_forward_menu_model.h"
 
 #include "base/path_service.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
+#include "chrome/test/base/test_browser_window.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/test_browser_thread.h"
 #include "content/public/test/web_contents_tester.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/codec/png_codec.h"
 
@@ skipping 468 matching lines @@
   EXPECT_EQ(ASCIIToUTF16("A && B"), back_model->GetLabelAt(2));
   EXPECT_EQ(ASCIIToUTF16("A &&&& B"), back_model->GetLabelAt(1));
   EXPECT_EQ(ASCIIToUTF16("A &&&&&& B"), back_model->GetLabelAt(0));
 #endif // defined(OS_MACOSX)
 }
 
 // Test asynchronous loading of favicon from history service.
 TEST_F(BackFwdMenuModelTest, FaviconLoadTest) {
   profile()->CreateHistoryService(true, false);
   profile()->CreateFaviconService();
-  Browser browser(Browser::TYPE_TABBED, profile());
+  scoped_ptr<Browser> browser(
+      chrome::CreateBrowserWithTestWindowForProfile(profile()));
   FaviconDelegate favicon_delegate;
 
   BackForwardMenuModel back_model(
-      &browser, BackForwardMenuModel::BACKWARD_MENU);
+      browser.get(), BackForwardMenuModel::BACKWARD_MENU);
   back_model.set_test_web_contents(controller().GetWebContents());
   back_model.SetMenuModelDelegate(&favicon_delegate);
 
   SkBitmap new_icon_bitmap(CreateBitmap(SK_ColorRED));
   std::vector<unsigned char> icon_data;
   gfx::PNGCodec::EncodeBGRASkBitmap(new_icon_bitmap, false, &icon_data);
 
   GURL url1 = GURL("http://www.a.com/1");
   GURL url2 = GURL("http://www.a.com/2");
   GURL url1_favicon("http://www.a.com/1/favicon.ico");
@@ skipping 35 matching lines @@
   // Verify we did not get the default favicon.
   EXPECT_NE(0, memcmp(default_icon_bitmap.getPixels(),
                       valid_icon_bitmap.getPixels(),
                       default_icon_bitmap.getSize()));
   // Verify we did get the expected favicon.
   EXPECT_EQ(0, memcmp(new_icon_bitmap.getPixels(),
                       valid_icon_bitmap.getPixels(),
                       new_icon_bitmap.getSize()));
 
   // Make sure the browser deconstructor doesn't have problems.
-  chrome::CloseAllTabs(&browser);
+  chrome::CloseAllTabs(browser.get());
   // This is required to prevent the message loop from hanging.
   profile()->DestroyHistoryService();
 }