Consolidate Browser Creation.

chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm

 // 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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/memory/scoped_nsobject.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
+#include "chrome/test/base/test_browser_window.h"
 #include "grit/generated_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #import "testing/gtest_mac.h"
 #include "testing/platform_test.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
 class BookmarkEditorBaseControllerTest : public CocoaProfileTest {
  public:
   BookmarkEditorBaseController* controller_;  // weak
   const BookmarkNode* folder_a_;
@@ skipping 44 matching lines @@
     return [[BookmarkEditorBaseController alloc]
             initWithParentWindow:test_window()
                          nibName:@"BookmarkAllTabs"
                          profile:profile()
                           parent:folder_b_0_
                              url:GURL()
                            title:string16()
                    configuration:BookmarkEditor::SHOW_TREE];
   }
 
-  virtual void SetUp() {
+  virtual void SetUp() OVERRIDE {
     CocoaProfileTest::SetUp();
     ASSERT_TRUE(profile());
 
     CreateModel();
     controller_ = CreateController();
     EXPECT_TRUE([controller_ window]);
     [controller_ runAsModalSheet];
   }
 
-  virtual void TearDown() {
+  virtual void TearDown() OVERRIDE {
     controller_ = NULL;
     CocoaTest::TearDown();
   }
+
+  virtual Browser* CreateBrowser() OVERRIDE {
+    return chrome::CreateBrowserWithTestWindowForProfile(profile());
+  }
 };
 
 TEST_F(BookmarkEditorBaseControllerTest, VerifyBookmarkTestModel) {
   BookmarkModel& model(*(profile()->GetBookmarkModel()));
   const BookmarkNode& root(*model.bookmark_bar_node());
   EXPECT_EQ(4, root.child_count());
   // a
   const BookmarkNode* child = root.GetChild(0);
   EXPECT_EQ(3, child->child_count());
   const BookmarkNode* subchild = child->GetChild(0);
@@ skipping 154 matching lines @@
       reinterpret_cast<const BookmarkNode*>(&children);
   BookmarkFolderInfo* info =
     [BookmarkFolderInfo bookmarkFolderInfoWithFolderName:@"name"
                                               folderNode:fakeNode
                                                 children:children];
   EXPECT_TRUE(info);
   EXPECT_EQ([info folderName], @"name");
   EXPECT_EQ([info children], children);
   EXPECT_EQ([info folderNode], fakeNode);
 }