Consolidate Browser Creation.

chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc

 // Copyright (c) 2011 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/gtk/bookmarks/bookmark_bar_gtk.h"
 
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/gtk/tabstrip_origin_provider.h"
+#include "chrome/test/base/test_browser_window.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
 
 // Dummy implementation that's good enough for the tests; we don't test
 // rendering here so all we need is a non-NULL object.
 class EmptyTabstripOriginProvider : public TabstripOriginProvider {
  public:
   virtual gfx::Point GetTabStripOriginForWidget(GtkWidget* widget) {
     return gfx::Point(0, 0);
   }
 };
 
 class BookmarkBarGtkUnittest : public testing::Test {
  protected:
   BookmarkBarGtkUnittest()
       : ui_thread_(BrowserThread::UI, &message_loop_),
         file_thread_(BrowserThread::FILE, &message_loop_) {
   }
 
   virtual void SetUp() OVERRIDE {
     profile_.reset(new TestingProfile());
     profile_->CreateBookmarkModel(true);
     profile_->BlockUntilBookmarkModelLoaded();
     model_ = profile_->GetBookmarkModel();
 
-    browser_.reset(new Browser(Browser::TYPE_TABBED, profile_.get()));
+    browser_.reset(
+        chrome::CreateBrowserWithTestWindowForProfile(profile_.get()));
     origin_provider_.reset(new EmptyTabstripOriginProvider);
     bookmark_bar_.reset(new BookmarkBarGtk(NULL, browser_.get(),
                                            origin_provider_.get()));
   }
 
   virtual void TearDown() OVERRIDE {
     message_loop_.RunAllPending();
 
     bookmark_bar_.reset();
     origin_provider_.reset();
@@ skipping 38 matching lines @@
                  ASCIIToUTF16("other"), GURL("http://two.com"));
 
   bookmark_bar_->Loaded(model_, false);
 
   // We should expect two children to the bookmark bar's toolbar.
   GList* children = gtk_container_get_children(
       GTK_CONTAINER(bookmark_bar_->bookmark_toolbar_.get()));
   EXPECT_EQ(2U, g_list_length(children));
   g_list_free(children);
 }