Switch BrowserTestHelper to use TestingProfileManager and update all corresponding tests.

BUG=none
TEST=unit_tests

Review URL: http://codereview.chromium.org/7825005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100313 0039d316-1c4b-4281-b951-d872f2087c98

36 files changed, 451 insertions, 443 deletions

diff --git a/chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.h b/chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.h
index 4012843..e870af2 100644
--- a/chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.h
+++ b/chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.h
@@ -11,8 +11,7 @@
 #include "base/memory/scoped_nsobject.h"
 #import "chrome/browser/app_controller_mac.h"
 #import "chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript.h"
-#include "chrome/browser/ui/cocoa/browser_test_helper.h"
-#include "chrome/browser/ui/cocoa/cocoa_test_helper.h"
+#include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #include "chrome/test/base/model_test_utils.h"
 #include "testing/platform_test.h"
 
@@ -21,9 +20,9 @@ class BookmarkModel;
 // The fake object that acts as our app's delegate, useful for testing purposes.
 @interface FakeAppDelegate : AppController {
  @public
-  BrowserTestHelper* helper_;  // weak.
+  CocoaProfileTest* test_;  // weak.
 }
-@property(nonatomic) BrowserTestHelper* helper;
+@property(nonatomic) CocoaProfileTest* test;
 // Return the |TestingProfile*| which is used for testing.
 - (Profile*)lastProfile;
 @end
@@ -38,12 +37,12 @@ class BookmarkModel;
 
 
 // The base class for all our bookmark releated unit tests.
-class BookmarkAppleScriptTest : public CocoaTest {
+class BookmarkAppleScriptTest : public CocoaProfileTest {
  public:
   BookmarkAppleScriptTest();
   virtual ~BookmarkAppleScriptTest();
+  virtual void SetUp();
  private:
-  BrowserTestHelper helper_;
   scoped_nsobject<FakeAppDelegate> appDelegate_;
  protected:
   scoped_nsobject<BookmarkFolderAppleScript> bookmarkBar_;
diff --git a/chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.mm b/chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.mm
index 57fd228..5edb666 100644
--- a/chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.mm
+++ b/chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.mm
@@ -8,12 +8,12 @@
 
 @implementation FakeAppDelegate
 
-@synthesize helper = helper_;
+@synthesize test = test_;
 
 - (Profile*)lastProfile {
-  if (!helper_)
+  if (!test_)
     return NULL;
-  return helper_->profile();
+  return test_->profile();
 }
 @end
 
@@ -47,8 +47,18 @@ static FakeScriptCommand* kFakeCurrentCommand;
 @end
 
 BookmarkAppleScriptTest::BookmarkAppleScriptTest() {
+}
+
+BookmarkAppleScriptTest::~BookmarkAppleScriptTest() {
+  [NSApp setDelegate:nil];
+}
+
+void BookmarkAppleScriptTest::SetUp() {
+  CocoaProfileTest::SetUp();
+  ASSERT_TRUE(profile());
+
   appDelegate_.reset([[FakeAppDelegate alloc] init]);
-  [appDelegate_.get() setHelper:&helper_];
+  [appDelegate_.get() setTest:this];
   DCHECK([NSApp delegate] == nil);
   [NSApp setDelegate:appDelegate_];
   const BookmarkNode* root = model().bookmark_bar_node();
@@ -58,10 +68,6 @@ BookmarkAppleScriptTest::BookmarkAppleScriptTest() {
       initWithBookmarkNode:model().bookmark_bar_node()]);
 }
 
-BookmarkAppleScriptTest::~BookmarkAppleScriptTest() {
-  [NSApp setDelegate:nil];
-}
-
 BookmarkModel& BookmarkAppleScriptTest::model() {
-  return *helper_.profile()->GetBookmarkModel();
+  return *profile()->GetBookmarkModel();
 }
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm
index 9df4c90..ba896c1 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm
@@ -9,8 +9,7 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.h"
-#include "chrome/browser/ui/cocoa/browser_test_helper.h"
-#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
+#include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
@@ -33,15 +32,14 @@
 
 @end
 
-class BookmarkAllTabsControllerTest : public CocoaTest {
+class BookmarkAllTabsControllerTest : public CocoaProfileTest {
  public:
-  BrowserTestHelper helper_;
   const BookmarkNode* parent_node_;
   BookmarkAllTabsControllerOverride* controller_;
   const BookmarkNode* folder_a_;
 
-  BookmarkAllTabsControllerTest() {
-    BookmarkModel& model(*(helper_.profile()->GetBookmarkModel()));
+  void CreateModel() {
+    BookmarkModel& model(*(profile()->GetBookmarkModel()));
     const BookmarkNode* root = model.bookmark_bar_node();
     folder_a_ = model.AddFolder(root, 0, ASCIIToUTF16("a"));
     model.AddURL(folder_a_, 0, ASCIIToUTF16("a-0"), GURL("http://a-0.com"));
@@ -52,20 +50,23 @@ class BookmarkAllTabsControllerTest : public CocoaTest {
   virtual BookmarkAllTabsControllerOverride* CreateController() {
     return [[BookmarkAllTabsControllerOverride alloc]
             initWithParentWindow:test_window()
-                         profile:helper_.profile()
+                         profile:profile()
                           parent:folder_a_
                    configuration:BookmarkEditor::SHOW_TREE];
   }
 
   virtual void SetUp() {
-    CocoaTest::SetUp();
+    CocoaProfileTest::SetUp();
+    ASSERT_TRUE(profile());
+
+    CreateModel();
     controller_ = CreateController();
     [controller_ runAsModalSheet];
   }
 
   virtual void TearDown() {
     controller_ = NULL;
-    CocoaTest::TearDown();
+    CocoaProfileTest::TearDown();
   }
 };
 
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge_unittest.mm
index 3877256..6f15504 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge_unittest.mm
@@ -4,8 +4,7 @@
 
 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h"
 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
-#include "chrome/browser/ui/cocoa/browser_test_helper.h"
-#include "chrome/browser/ui/cocoa/cocoa_test_helper.h"
+#include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #import "testing/gtest_mac.h"
 #include "testing/platform_test.h"
@@ -91,16 +90,12 @@ typedef std::pair<GURL,WindowOpenDisposition> OpenInfo;
 @end
 
 
-class BookmarkBarBridgeTest : public CocoaTest {
- public:
-  BrowserTestHelper browser_test_helper_;
+class BookmarkBarBridgeTest : public CocoaProfileTest {
 };
 
 // Call all the callbacks; make sure they are all redirected to the objc object.
 TEST_F(BookmarkBarBridgeTest, TestRedirect) {
-  Browser* browser = browser_test_helper_.browser();
-  Profile* profile = browser_test_helper_.profile();
-  BookmarkModel* model = profile->GetBookmarkModel();
+  BookmarkModel* model = profile()->GetBookmarkModel();
 
   scoped_nsobject<NSView> parentView([[NSView alloc]
                                        initWithFrame:NSMakeRect(0,0,100,100)]);
@@ -110,7 +105,7 @@ TEST_F(BookmarkBarBridgeTest, TestRedirect) {
       [[NSView alloc] initWithFrame:NSMakeRect(0,0,100,100)]);
 
   scoped_nsobject<FakeBookmarkBarController>
-      controller([[FakeBookmarkBarController alloc] initWithBrowser:browser]);
+      controller([[FakeBookmarkBarController alloc] initWithBrowser:browser()]);
   EXPECT_TRUE(controller.get());
   scoped_ptr<BookmarkBarBridge> bridge(new BookmarkBarBridge(controller.get(),
                                                              model));
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
index 5d612c8..b32f9e2 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
@@ -23,8 +23,7 @@
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu.h"
 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h"
-#include "chrome/browser/ui/cocoa/browser_test_helper.h"
-#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
+#include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #include "chrome/browser/ui/cocoa/test_event_utils.h"
 #import "chrome/browser/ui/cocoa/view_resizer_pong.h"
 #include "chrome/test/base/model_test_utils.h"
@@ -265,16 +264,18 @@ class FakeTheme : public ui::ThemeProvider {
 
 namespace {
 
-class BookmarkBarControllerTestBase : public CocoaTest {
+class BookmarkBarControllerTestBase : public CocoaProfileTest {
  public:
-  BrowserTestHelper helper_;
   scoped_nsobject<NSView> parent_view_;
   scoped_nsobject<ViewResizerPong> resizeDelegate_;
 
-  BookmarkBarControllerTestBase() {
+  virtual void SetUp() {
+    CocoaProfileTest::SetUp();
+    ASSERT_TRUE(profile());
+
     FilePath extension_dir;
-    helper_.profile()->CreateExtensionService(CommandLine::ForCurrentProcess(),
-                                              extension_dir, false);
+    profile()->CreateExtensionService(CommandLine::ForCurrentProcess(),
+                                      extension_dir, false);
     resizeDelegate_.reset([[ViewResizerPong alloc] init]);
     NSRect parent_frame = NSMakeRect(0, 0, 800, 50);
     parent_view_.reset([[NSView alloc] initWithFrame:parent_frame]);
@@ -311,10 +312,13 @@ class BookmarkBarControllerTest : public BookmarkBarControllerTestBase {
   scoped_nsobject<NSButtonCell> cell_;
   scoped_nsobject<BookmarkBarControllerNoOpen> bar_;
 
-  BookmarkBarControllerTest() {
+  virtual void SetUp() {
+    BookmarkBarControllerTestBase::SetUp();
+    ASSERT_TRUE(browser());
+
     bar_.reset(
       [[BookmarkBarControllerNoOpen alloc]
-          initWithBrowser:helper_.browser()
+          initWithBrowser:browser()
              initialWidth:NSWidth([parent_view_ frame])
                  delegate:nil
            resizeDelegate:resizeDelegate_.get()]);
@@ -333,7 +337,7 @@ class BookmarkBarControllerTest : public BookmarkBarControllerTestBase {
 
   // Return a menu item that points to the given URL.
   NSMenuItem* ItemForBookmarkBarMenu(GURL& gurl) {
-    BookmarkModel* model = helper_.profile()->GetBookmarkModel();
+    BookmarkModel* model = profile()->GetBookmarkModel();
     const BookmarkNode* parent = model->bookmark_bar_node();
     const BookmarkNode* node = model->AddURL(parent, parent->child_count(),
                                              ASCIIToUTF16("A title"), gurl);
@@ -504,7 +508,7 @@ TEST_F(BookmarkBarControllerTest, FrameChangeNotification) {
   scoped_nsobject<BookmarkBarControllerTogglePong> bar;
   bar.reset(
     [[BookmarkBarControllerTogglePong alloc]
-          initWithBrowser:helper_.browser()
+          initWithBrowser:browser()
              initialWidth:100  // arbitrary
                  delegate:nil
            resizeDelegate:resizeDelegate_.get()]);
@@ -521,7 +525,7 @@ TEST_F(BookmarkBarControllerTest, FrameChangeNotification) {
 // Confirm our "no items" container goes away when we add the 1st
 // bookmark, and comes back when we delete the bookmark.
 TEST_F(BookmarkBarControllerTest, NoItemContainerGoesAway) {
-  BookmarkModel* model = helper_.profile()->GetBookmarkModel();
+  BookmarkModel* model = profile()->GetBookmarkModel();
   const BookmarkNode* bar = model->bookmark_bar_node();
 
   [bar_ loaded:model];
@@ -554,7 +558,7 @@ TEST_F(BookmarkBarControllerTest, NoItemContainerGoesAway) {
 
 // Confirm off the side button only enabled when reasonable.
 TEST_F(BookmarkBarControllerTest, OffTheSideButtonHidden) {
-  BookmarkModel* model = helper_.profile()->GetBookmarkModel();
+  BookmarkModel* model = profile()->GetBookmarkModel();
   [bar_ setIgnoreAnimations:YES];
 
   [bar_ loaded:model];
@@ -621,7 +625,7 @@ TEST_F(BookmarkBarControllerTest, TagMap) {
 }
 
 TEST_F(BookmarkBarControllerTest, MenuForFolderNode) {
-  BookmarkModel* model = helper_.profile()->GetBookmarkModel();
+  BookmarkModel* model = profile()->GetBookmarkModel();
 
   // First make sure something (e.g. "(empty)" string) is always present.
   NSMenu* menu = [bar_ menuForFolderNode:model->bookmark_bar_node()];
@@ -706,7 +710,7 @@ TEST_F(BookmarkBarControllerTest, OpenBookmarkFromMenus) {
 }
 
 TEST_F(BookmarkBarControllerTest, TestAddRemoveAndClear) {
-  BookmarkModel* model = helper_.profile()->GetBookmarkModel();
+  BookmarkModel* model = profile()->GetBookmarkModel();
   NSView* buttonView = [bar_ buttonView];
   EXPECT_EQ(0U, [[bar_ buttons] count]);
   unsigned int initial_subview_count = [[buttonView subviews] count];
@@ -756,7 +760,7 @@ TEST_F(BookmarkBarControllerTest, TestAddRemoveAndClear) {
 // Make sure we don't create too many buttons; we only really need
 // ones that will be visible.
 TEST_F(BookmarkBarControllerTest, TestButtonLimits) {
-  BookmarkModel* model = helper_.profile()->GetBookmarkModel();
+  BookmarkModel* model = profile()->GetBookmarkModel();
   EXPECT_EQ(0U, [[bar_ buttons] count]);
   // Add one; make sure we see it.
   const BookmarkNode* parent = model->bookmark_bar_node();
@@ -816,7 +820,7 @@ TEST_F(BookmarkBarControllerTest, TestButtonMarch) {
 
 TEST_F(BookmarkBarControllerTest, CheckForGrowth) {
   WithNoAnimation at_all; // Turn off Cocoa auto animation in this scope.
-  BookmarkModel* model = helper_.profile()->GetBookmarkModel();
+  BookmarkModel* model = profile()->GetBookmarkModel();
   GURL gurl1("http://www.google.com");
   string16 title1(ASCIIToUTF16("x"));
   bookmark_utils::AddIfNotBookmarked(model, gurl1, title1);
@@ -843,7 +847,7 @@ TEST_F(BookmarkBarControllerTest, CheckForGrowth) {
 }
 
 TEST_F(BookmarkBarControllerTest, DeleteBookmark) {
-  BookmarkModel* model = helper_.profile()->GetBookmarkModel();
+  BookmarkModel* model = profile()->GetBookmarkModel();
 
   const char* urls[] = { "https://secret.url.com",
                          "http://super.duper.web.site.for.doodz.gov",
@@ -868,7 +872,7 @@ TEST_F(BookmarkBarControllerTest, DeleteBookmark) {
 // checkForBookmarkButtonGrowth:.
 
 TEST_F(BookmarkBarControllerTest, Cell) {
-  BookmarkModel* model = helper_.profile()->GetBookmarkModel();
+  BookmarkModel* model = profile()->GetBookmarkModel();
   [bar_ loaded:model];
 
   const BookmarkNode* parent = model->bookmark_bar_node();
@@ -899,7 +903,7 @@ TEST_F(BookmarkBarControllerTest, Display) {
 
 // Test that middle clicking on a bookmark button results in an open action.
 TEST_F(BookmarkBarControllerTest, MiddleClick) {
-  BookmarkModel* model = helper_.profile()->GetBookmarkModel();
+  BookmarkModel* model = profile()->GetBookmarkModel();
   GURL gurl1("http://www.google.com/");
   string16 title1(ASCIIToUTF16("x"));
   bookmark_utils::AddIfNotBookmarked(model, gurl1, title1);
@@ -913,13 +917,13 @@ TEST_F(BookmarkBarControllerTest, MiddleClick) {
 }
 
 TEST_F(BookmarkBarControllerTest, DisplaysHelpMessageOnEmpty) {
-  BookmarkModel* model = helper_.profile()->GetBookmarkModel();
+  BookmarkModel* model = profile()->GetBookmarkModel();
   [bar_ loaded:model];
   EXPECT_FALSE([[[bar_ buttonView] noItemContainer] isHidden]);
 }
 
 TEST_F(BookmarkBarControllerTest, HidesHelpMessageWithBookmark) {
-  BookmarkModel* model = helper_.profile()->GetBookmarkModel();
+  BookmarkModel* model = profile()->GetBookmarkModel();
 
   const BookmarkNode* parent = model->bookmark_bar_node();
   model->AddURL(parent, parent->child_count(),
@@ -930,7 +934,7 @@ TEST_F(BookmarkBarControllerTest, HidesHelpMessageWithBookmark) {
 }
 
 TEST_F(BookmarkBarControllerTest, BookmarkButtonSizing) {
-  BookmarkModel* model = helper_.profile()->GetBookmarkModel();
+  BookmarkModel* model = profile()->GetBookmarkModel();
 
   const BookmarkNode* parent = model->bookmark_bar_node();
   model->AddURL(parent, parent->child_count(),
@@ -971,7 +975,7 @@ TEST_F(BookmarkBarControllerTest, DropBookmarks) {
     [nstitles addObject:base::SysUTF8ToNSString(titles[i])];
   }
 
-  BookmarkModel* model = helper_.profile()->GetBookmarkModel();
+  BookmarkModel* model = profile()->GetBookmarkModel();
   const BookmarkNode* parent = model->bookmark_bar_node();
   [bar_ addURLs:nsurls withTitles:nstitles at:NSZeroPoint];
   EXPECT_EQ(4, parent->child_count());
@@ -991,7 +995,7 @@ TEST_F(BookmarkBarControllerTest, DropBookmarks) {
 }
 
 TEST_F(BookmarkBarControllerTest, TestButtonOrBar) {
-  BookmarkModel* model = helper_.profile()->GetBookmarkModel();
+  BookmarkModel* model = profile()->GetBookmarkModel();
   GURL gurl1("http://www.google.com");
   string16 title1(ASCIIToUTF16("x"));
   bookmark_utils::AddIfNotBookmarked(model, gurl1, title1);
@@ -1021,7 +1025,7 @@ TEST_F(BookmarkBarControllerTest, TestButtonOrBar) {
 }
 
 TEST_F(BookmarkBarControllerTest, TestMenuNodeAndDisable) {
-  BookmarkModel* model = helper_.profile()->GetBookmarkModel();
+  BookmarkModel* model = profile()->GetBookmarkModel();
   const BookmarkNode* parent = model->bookmark_bar_node();
   const BookmarkNode* folder = model->AddFolder(parent,
                                                 parent->child_count(),
@@ -1049,7 +1053,7 @@ TEST_F(BookmarkBarControllerTest, TestMenuNodeAndDisable) {
 
 TEST_F(BookmarkBarControllerTest, TestDragButton) {
   WithNoAnimation at_all;
-  BookmarkModel* model = helper_.profile()->GetBookmarkModel();
+  BookmarkModel* model = profile()->GetBookmarkModel();
 
   GURL gurls[] = { GURL("http://www.google.com/a"),
                    GURL("http://www.google.com/b"),
@@ -1120,7 +1124,7 @@ TEST_F(BookmarkBarControllerTest, TestDragButton) {
 }
 
 TEST_F(BookmarkBarControllerTest, TestCopyButton) {
-  BookmarkModel* model = helper_.profile()->GetBookmarkModel();
+  BookmarkModel* model = profile()->GetBookmarkModel();
 
   GURL gurls[] = { GURL("http://www.google.com/a"),
                    GURL("http://www.google.com/b"),
@@ -1150,7 +1154,7 @@ TEST_F(BookmarkBarControllerTest, TestCopyButton) {
 // Fake a theme with colored text.  Apply it and make sure bookmark
 // buttons have the same colored text.  Repeat more than once.
 TEST_F(BookmarkBarControllerTest, TestThemedButton) {
-  BookmarkModel* model = helper_.profile()->GetBookmarkModel();
+  BookmarkModel* model = profile()->GetBookmarkModel();
   bookmark_utils::AddIfNotBookmarked(
       model, GURL("http://www.foo.com"), ASCIIToUTF16("small"));
   BookmarkButton* button = [[bar_ buttons] objectAtIndex:0];
@@ -1176,7 +1180,7 @@ TEST_F(BookmarkBarControllerTest, TestThemedButton) {
 // Test that delegates and targets of buttons are cleared on dealloc.
 TEST_F(BookmarkBarControllerTest, TestClearOnDealloc) {
   // Make some bookmark buttons.
-  BookmarkModel* model = helper_.profile()->GetBookmarkModel();
+  BookmarkModel* model = profile()->GetBookmarkModel();
   GURL gurls[] = { GURL("http://www.foo.com/"),
                    GURL("http://www.bar.com/"),
                    GURL("http://www.baz.com/") };
@@ -1218,7 +1222,7 @@ TEST_F(BookmarkBarControllerTest, DISABLED_OffTheSideFolder) {
   EXPECT_TRUE([bar_ offTheSideButtonIsHidden]);
 
   // Create some buttons.
-  BookmarkModel* model = helper_.profile()->GetBookmarkModel();
+  BookmarkModel* model = profile()->GetBookmarkModel();
   const BookmarkNode* parent = model->bookmark_bar_node();
   for (int x = 0; x < 30; x++) {
     model->AddURL(parent, parent->child_count(),
@@ -1258,7 +1262,7 @@ TEST_F(BookmarkBarControllerTest, DISABLED_OffTheSideFolder) {
 
 TEST_F(BookmarkBarControllerTest, DropDestination) {
   // Make some buttons.
-  BookmarkModel* model = helper_.profile()->GetBookmarkModel();
+  BookmarkModel* model = profile()->GetBookmarkModel();
   const BookmarkNode* parent = model->bookmark_bar_node();
   model->AddFolder(parent, parent->child_count(), ASCIIToUTF16("folder 1"));
   model->AddFolder(parent, parent->child_count(), ASCIIToUTF16("folder 2"));
@@ -1296,7 +1300,7 @@ TEST_F(BookmarkBarControllerTest, DropDestination) {
 }
 
 TEST_F(BookmarkBarControllerTest, NodeDeletedWhileContextMenuIsOpen) {
-  BookmarkModel* model = helper_.profile()->GetBookmarkModel();
+  BookmarkModel* model = profile()->GetBookmarkModel();
   [bar_ loaded:model];
 
   const BookmarkNode* parent = model->bookmark_bar_node();
@@ -1322,7 +1326,7 @@ TEST_F(BookmarkBarControllerTest, NodeDeletedWhileContextMenuIsOpen) {
 }
 
 TEST_F(BookmarkBarControllerTest, MoveRemoveAddButtons) {
-  BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
+  BookmarkModel& model(*profile()->GetBookmarkModel());
   const BookmarkNode* root = model.bookmark_bar_node();
   const std::string model_string("1b 2f:[ 2f1b 2f2b ] 3b ");
   model_test_utils::AddNodesFromModelString(model, root, model_string);
@@ -1396,12 +1400,15 @@ TEST_F(BookmarkBarControllerTest, ShrinkOrHideView) {
 
 class BookmarkBarControllerOpenAllTest : public BookmarkBarControllerTest {
 public:
-  BookmarkBarControllerOpenAllTest() {
+  virtual void SetUp() {
+    BookmarkBarControllerTest::SetUp();
+    ASSERT_TRUE(profile());
+
     resizeDelegate_.reset([[ViewResizerPong alloc] init]);
     NSRect parent_frame = NSMakeRect(0, 0, 800, 50);
     bar_.reset(
                [[BookmarkBarControllerOpenAllPong alloc]
-                initWithBrowser:helper_.browser()
+                initWithBrowser:browser()
                    initialWidth:NSWidth(parent_frame)
                        delegate:nil
                  resizeDelegate:resizeDelegate_.get()]);
@@ -1412,7 +1419,7 @@ public:
     frame.origin.y = 100;
     [[[bar_ view] superview] setFrame:frame];
 
-    BookmarkModel* model = helper_.profile()->GetBookmarkModel();
+    BookmarkModel* model = profile()->GetBookmarkModel();
     parent_ = model->bookmark_bar_node();
     // { one, { two-one, two-two }, three }
     model->AddURL(parent_, parent_->child_count(), ASCIIToUTF16("title"),
@@ -1496,16 +1503,19 @@ TEST_F(BookmarkBarControllerOpenAllTest, CommandClickOnFolder) {
   NSApp = oldApp;
 }
 
-class BookmarkBarControllerNotificationTest : public CocoaTest {
+class BookmarkBarControllerNotificationTest : public CocoaProfileTest {
  public:
-  BookmarkBarControllerNotificationTest() {
+  virtual void SetUp() {
+    CocoaProfileTest::SetUp();
+    ASSERT_TRUE(browser());
+
     resizeDelegate_.reset([[ViewResizerPong alloc] init]);
     NSRect parent_frame = NSMakeRect(0, 0, 800, 50);
     parent_view_.reset([[NSView alloc] initWithFrame:parent_frame]);
     [parent_view_ setHidden:YES];
     bar_.reset(
       [[BookmarkBarControllerNotificationPong alloc]
-          initWithBrowser:helper_.browser()
+          initWithBrowser:browser()
              initialWidth:NSWidth(parent_frame)
                  delegate:nil
            resizeDelegate:resizeDelegate_.get()]);
@@ -1521,7 +1531,6 @@ class BookmarkBarControllerNotificationTest : public CocoaTest {
     // Do not add the bar to a window, yet.
   }
 
-  BrowserTestHelper helper_;
   scoped_nsobject<NSView> parent_view_;
   scoped_nsobject<ViewResizerPong> resizeDelegate_;
   scoped_nsobject<BookmarkBarControllerNotificationPong> bar_;
@@ -1562,10 +1571,13 @@ class BookmarkBarControllerDragDropTest : public BookmarkBarControllerTestBase {
  public:
   scoped_nsobject<BookmarkBarControllerDragData> bar_;
 
-  BookmarkBarControllerDragDropTest() {
+  virtual void SetUp() {
+    BookmarkBarControllerTestBase::SetUp();
+    ASSERT_TRUE(browser());
+
     bar_.reset(
                [[BookmarkBarControllerDragData alloc]
-                initWithBrowser:helper_.browser()
+                initWithBrowser:browser()
                    initialWidth:NSWidth([parent_view_ frame])
                        delegate:nil
                  resizeDelegate:resizeDelegate_.get()]);
@@ -1576,7 +1588,7 @@ class BookmarkBarControllerDragDropTest : public BookmarkBarControllerTestBase {
 // TODO(rsesek): Fix off the side menu for new-style menus.
 TEST_F(BookmarkBarControllerDragDropTest,
     DISABLED_DragMoveBarBookmarkToOffTheSide) {
-  BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
+  BookmarkModel& model(*profile()->GetBookmarkModel());
   const BookmarkNode* root = model.bookmark_bar_node();
   const std::string model_string("1bWithLongName 2fWithLongName:[ "
       "2f1bWithLongName 2f2fWithLongName:[ 2f2f1bWithLongName "
@@ -1628,7 +1640,7 @@ TEST_F(BookmarkBarControllerDragDropTest,
 }
 
 TEST_F(BookmarkBarControllerDragDropTest, DragBookmarkData) {
-  BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
+  BookmarkModel& model(*profile()->GetBookmarkModel());
   const BookmarkNode* root = model.bookmark_bar_node();
   const std::string model_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b 2f2f3b ] "
                                   "2f3b ] 3b 4b ");
@@ -1688,7 +1700,7 @@ TEST_F(BookmarkBarControllerDragDropTest, DragBookmarkData) {
 }
 
 TEST_F(BookmarkBarControllerDragDropTest, AddURLs) {
-  BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
+  BookmarkModel& model(*profile()->GetBookmarkModel());
   const BookmarkNode* root = model.bookmark_bar_node();
   const std::string model_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b 2f2f3b ] "
                                  "2f3b ] 3b 4b ");
@@ -1720,7 +1732,7 @@ TEST_F(BookmarkBarControllerDragDropTest, AddURLs) {
 }
 
 TEST_F(BookmarkBarControllerDragDropTest, ControllerForNode) {
-  BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
+  BookmarkModel& model(*profile()->GetBookmarkModel());
   const BookmarkNode* root = model.bookmark_bar_node();
   const std::string model_string("1b 2f:[ 2f1b 2f2b ] 3b ");
   model_test_utils::AddNodesFromModelString(model, root, model_string);
@@ -1736,7 +1748,7 @@ TEST_F(BookmarkBarControllerDragDropTest, ControllerForNode) {
 }
 
 TEST_F(BookmarkBarControllerDragDropTest, DropPositionIndicator) {
-  BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
+  BookmarkModel& model(*profile()->GetBookmarkModel());
   const BookmarkNode* root = model.bookmark_bar_node();
   const std::string model_string("1b 2f:[ 2f1b 2f2b 2f3b ] 3b 4b ");
   model_test_utils::AddNodesFromModelString(model, root, model_string);
@@ -1768,7 +1780,7 @@ TEST_F(BookmarkBarControllerDragDropTest, DropPositionIndicator) {
 }
 
 TEST_F(BookmarkBarControllerDragDropTest, PulseButton) {
-  BookmarkModel* model = helper_.profile()->GetBookmarkModel();
+  BookmarkModel* model = profile()->GetBookmarkModel();
   const BookmarkNode* root = model->bookmark_bar_node();
   GURL gurl("http://www.google.com");
   const BookmarkNode* node = model->AddURL(root, root->child_count(),
@@ -1803,7 +1815,7 @@ TEST_F(BookmarkBarControllerDragDropTest, PulseButton) {
 }
 
 TEST_F(BookmarkBarControllerDragDropTest, DragBookmarkDataToTrash) {
-  BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
+  BookmarkModel& model(*profile()->GetBookmarkModel());
   const BookmarkNode* root = model.bookmark_bar_node();
   const std::string model_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b 2f2f3b ] "
                                   "2f3b ] 3b 4b ");
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm
index f496f20..3c2df2b 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm
@@ -14,7 +14,7 @@
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.h"
 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_unittest_helper.h"
-#include "chrome/browser/ui/cocoa/browser_test_helper.h"
+#include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #import "chrome/browser/ui/cocoa/view_resizer_pong.h"
 #include "chrome/test/base/model_test_utils.h"
@@ -26,10 +26,10 @@ namespace {
 const int kLotsOfNodesCount = 150;
 };
 
-class BookmarkBarFolderControllerTest : public CocoaTest {
+class BookmarkBarFolderControllerTest : public CocoaProfileTest {
  public:
   BookmarkModel* GetModel() {
-    return helper_.profile()->GetBookmarkModel();
+    return profile()->GetBookmarkModel();
   }
 
   BookmarkBarFolderController* CreateController(const BookmarkNode* node) {
@@ -50,9 +50,6 @@ class BookmarkBarFolderControllerTest : public CocoaTest {
   NSMenu* GetMenu(BookmarkBarFolderController* controller) {
     return [[controller menuBridge]->controller() menu];
   }
-
- private:
-  BrowserTestHelper helper_;
 };
 
 TEST_F(BookmarkBarFolderControllerTest, SimpleFolder) {
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm
index e781088..a3ea24f 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm
@@ -8,9 +8,8 @@
 #include "base/memory/scoped_nsobject.h"
 #include "base/utf_string_conversions.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h"
-#include "chrome/browser/ui/cocoa/browser_test_helper.h"
 #include "chrome/browser/ui/cocoa/browser_window_controller.h"
-#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
+#include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #import "chrome/browser/ui/cocoa/info_bubble_window.h"
 #include "content/common/notification_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -54,10 +53,9 @@
 
 namespace {
 
-class BookmarkBubbleControllerTest : public CocoaTest {
+class BookmarkBubbleControllerTest : public CocoaProfileTest {
  public:
   static int edits_;
-  BrowserTestHelper helper_;
   BookmarkBubbleController* controller_;
 
   BookmarkBubbleControllerTest() : controller_(nil) {
@@ -66,7 +64,7 @@ class BookmarkBubbleControllerTest : public CocoaTest {
 
   virtual void TearDown() {
     [controller_ close];
-    CocoaTest::TearDown();
+    CocoaProfileTest::TearDown();
   }
 
   // Returns a controller but ownership not transferred.
@@ -78,7 +76,7 @@ class BookmarkBubbleControllerTest : public CocoaTest {
     }
     controller_ = [[BookmarkBubbleController alloc]
                       initWithParentWindow:test_window()
-                                     model:helper_.profile()->GetBookmarkModel()
+                                     model:profile()->GetBookmarkModel()
                                       node:node
                          alreadyBookmarked:YES];
     EXPECT_TRUE([controller_ window]);
@@ -89,7 +87,7 @@ class BookmarkBubbleControllerTest : public CocoaTest {
   }
 
   BookmarkModel* GetBookmarkModel() {
-    return helper_.profile()->GetBookmarkModel();
+    return profile()->GetBookmarkModel();
   }
 
   bool IsWindowClosing() {
@@ -394,7 +392,7 @@ TEST_F(BookmarkBubbleControllerTest, EscapeRemovesNewBookmark) {
   BookmarkBubbleController* controller =
       [[BookmarkBubbleController alloc]
           initWithParentWindow:test_window()
-                         model:helper_.profile()->GetBookmarkModel()
+                         model:profile()->GetBookmarkModel()
                           node:node
              alreadyBookmarked:NO];  // The last param is the key difference.
   EXPECT_TRUE([controller window]);
@@ -469,7 +467,7 @@ TEST_F(BookmarkBubbleControllerTest, BubbleGoesAwayOnNewTab) {
   EXPECT_FALSE(IsWindowClosing());
 
   // We can't actually create a new tab here, e.g.
-  //   helper_.browser()->AddTabWithURL(...);
+  //   browser()->AddTabWithURL(...);
   // Many of our browser objects (Browser, Profile, RequestContext)
   // are "just enough" to run tests without being complete.  Instead
   // we fake the notification that would be triggered by a tab
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell_unittest.mm
index 863078d..7fd08e3 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell_unittest.mm
@@ -7,7 +7,7 @@
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu.h"
-#include "chrome/browser/ui/cocoa/browser_test_helper.h"
+#include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
@@ -36,9 +36,7 @@
 
 namespace {
 
-class BookmarkButtonCellTest : public CocoaTest {
-  public:
-    BrowserTestHelper helper_;
+class BookmarkButtonCellTest : public CocoaProfileTest {
 };
 
 // Make sure it's not totally bogus
@@ -94,7 +92,7 @@ TEST_F(BookmarkButtonCellTest, MouseEnterStuff) {
   [cell setMenu:[[[BookmarkMenu alloc] initWithTitle:@"foo"] autorelease]];
   EXPECT_FALSE([cell menu]);
 
-  BookmarkModel* model = helper_.profile()->GetBookmarkModel();
+  BookmarkModel* model = profile()->GetBookmarkModel();
   const BookmarkNode* node = model->bookmark_bar_node();
   [cell setEmpty:NO];
   [cell setBookmarkNode:node];
@@ -107,7 +105,7 @@ TEST_F(BookmarkButtonCellTest, MouseEnterStuff) {
 }
 
 TEST_F(BookmarkButtonCellTest, BookmarkNode) {
-  BookmarkModel& model(*(helper_.profile()->GetBookmarkModel()));
+  BookmarkModel& model(*(profile()->GetBookmarkModel()));
   scoped_nsobject<BookmarkButtonCell> cell(
       [[BookmarkButtonCell alloc] initTextCell:@"Testing"]);
 
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_button_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_button_unittest.mm
index aec13c6..f337ea8 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_button_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_button_unittest.mm
@@ -7,8 +7,7 @@
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.h"
-#import "chrome/browser/ui/cocoa/browser_test_helper.h"
-#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
+#include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #import "chrome/browser/ui/cocoa/test_event_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
@@ -60,7 +59,7 @@
 
 namespace {
 
-class BookmarkButtonTest : public CocoaTest {
+class BookmarkButtonTest : public CocoaProfileTest {
 };
 
 // Make sure nothing leaks
@@ -71,7 +70,6 @@ TEST_F(BookmarkButtonTest, Create) {
 
 // Test folder and empty node queries.
 TEST_F(BookmarkButtonTest, FolderAndEmptyOrNot) {
-  BrowserTestHelper helper_;
   scoped_nsobject<BookmarkButton> button;
   scoped_nsobject<BookmarkButtonCell> cell;
 
@@ -88,7 +86,7 @@ TEST_F(BookmarkButtonTest, FolderAndEmptyOrNot) {
   // Since this returns (does not actually begin a modal drag), success!
   [button beginDrag:downEvent];
 
-  BookmarkModel* model = helper_.profile()->GetBookmarkModel();
+  BookmarkModel* model = profile()->GetBookmarkModel();
   const BookmarkNode* node = model->bookmark_bar_node();
   [cell setBookmarkNode:node];
   EXPECT_FALSE([button isEmpty]);
@@ -129,8 +127,6 @@ TEST_F(BookmarkButtonTest, MouseEnterExitRedirect) {
 }
 
 TEST_F(BookmarkButtonTest, DragToTrash) {
-  BrowserTestHelper helper_;
-
   scoped_nsobject<BookmarkButton> button;
   scoped_nsobject<BookmarkButtonCell> cell;
   scoped_nsobject<FakeButtonDelegate>
@@ -141,7 +137,7 @@ TEST_F(BookmarkButtonTest, DragToTrash) {
   [button setDelegate:delegate];
 
   // Add a deletable bookmark to the button.
-  BookmarkModel* model = helper_.profile()->GetBookmarkModel();
+  BookmarkModel* model = profile()->GetBookmarkModel();
   const BookmarkNode* barNode = model->bookmark_bar_node();
   const BookmarkNode* node = model->AddURL(barNode, 0, ASCIIToUTF16("hi mom"),
                                            GURL("http://www.google.com"));
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm
index 6c35175..40b3ea7 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm
@@ -9,17 +9,15 @@
 #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/browser_test_helper.h"
-#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
+#include "chrome/browser/ui/cocoa/cocoa_profile_test.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 CocoaTest {
+class BookmarkEditorBaseControllerTest : public CocoaProfileTest {
  public:
-  BrowserTestHelper browser_helper_;
   BookmarkEditorBaseController* controller_;  // weak
   const BookmarkNode* folder_a_;
   const BookmarkNode* folder_b_;
@@ -27,7 +25,7 @@ class BookmarkEditorBaseControllerTest : public CocoaTest {
   const BookmarkNode* folder_b_3_;
   const BookmarkNode* folder_c_;
 
-  BookmarkEditorBaseControllerTest() {
+  void CreateModel() {
     // Set up a small bookmark hierarchy, which will look as follows:
     //    a      b      c    d
     //     a-0    b-0    c-0
@@ -38,7 +36,7 @@ class BookmarkEditorBaseControllerTest : public CocoaTest {
     //             b-30
     //             b-31
     //            b-4
-    BookmarkModel& model(*(browser_helper_.profile()->GetBookmarkModel()));
+    BookmarkModel& model(*(profile()->GetBookmarkModel()));
     const BookmarkNode* root = model.bookmark_bar_node();
     folder_a_ = model.AddFolder(root, 0, ASCIIToUTF16("a"));
     model.AddURL(folder_a_, 0, ASCIIToUTF16("a-0"), GURL("http://a-0.com"));
@@ -69,13 +67,16 @@ class BookmarkEditorBaseControllerTest : public CocoaTest {
     return [[BookmarkEditorBaseController alloc]
             initWithParentWindow:test_window()
                          nibName:@"BookmarkAllTabs"
-                         profile:browser_helper_.profile()
+                         profile:profile()
                           parent:folder_b_0_
                    configuration:BookmarkEditor::SHOW_TREE];
   }
 
   virtual void SetUp() {
-    CocoaTest::SetUp();
+    CocoaProfileTest::SetUp();
+    ASSERT_TRUE(profile());
+
+    CreateModel();
     controller_ = CreateController();
     EXPECT_TRUE([controller_ window]);
     [controller_ runAsModalSheet];
@@ -88,7 +89,7 @@ class BookmarkEditorBaseControllerTest : public CocoaTest {
 };
 
 TEST_F(BookmarkEditorBaseControllerTest, VerifyBookmarkTestModel) {
-  BookmarkModel& model(*(browser_helper_.profile()->GetBookmarkModel()));
+  BookmarkModel& model(*(profile()->GetBookmarkModel()));
   const BookmarkNode& root(*model.bookmark_bar_node());
   EXPECT_EQ(4, root.child_count());
   // a
@@ -168,7 +169,7 @@ TEST_F(BookmarkEditorBaseControllerTest, CreateFolder) {
 }
 
 TEST_F(BookmarkEditorBaseControllerTest, CreateTwoFolders) {
-  BookmarkModel* model = browser_helper_.profile()->GetBookmarkModel();
+  BookmarkModel* model = profile()->GetBookmarkModel();
   const BookmarkNode* bar = model->bookmark_bar_node();
   // Create 2 folders which are children of the bar.
   [controller_ selectTestNodeInBrowser:bar];
@@ -182,7 +183,7 @@ TEST_F(BookmarkEditorBaseControllerTest, CreateTwoFolders) {
 }
 
 TEST_F(BookmarkEditorBaseControllerTest, SelectedFolderDeleted) {
-  BookmarkModel& model(*(browser_helper_.profile()->GetBookmarkModel()));
+  BookmarkModel& model(*(profile()->GetBookmarkModel()));
   [controller_ selectTestNodeInBrowser:folder_b_3_];
   EXPECT_EQ(folder_b_3_, [controller_ selectedNode]);
 
@@ -194,7 +195,7 @@ TEST_F(BookmarkEditorBaseControllerTest, SelectedFolderDeleted) {
 }
 
 TEST_F(BookmarkEditorBaseControllerTest, SelectedFoldersParentDeleted) {
-  BookmarkModel& model(*(browser_helper_.profile()->GetBookmarkModel()));
+  BookmarkModel& model(*(profile()->GetBookmarkModel()));
   const BookmarkNode* root = model.bookmark_bar_node();
   [controller_ selectTestNodeInBrowser:folder_b_3_];
   EXPECT_EQ(folder_b_3_, [controller_ selectedNode]);
@@ -207,7 +208,7 @@ TEST_F(BookmarkEditorBaseControllerTest, SelectedFoldersParentDeleted) {
 }
 
 TEST_F(BookmarkEditorBaseControllerTest, FolderAdded) {
-  BookmarkModel& model(*(browser_helper_.profile()->GetBookmarkModel()));
+  BookmarkModel& model(*(profile()->GetBookmarkModel()));
   const BookmarkNode* root = model.bookmark_bar_node();
 
   // Add a folder node to the model, and verify it can be selected in the tree:
@@ -221,7 +222,7 @@ TEST_F(BookmarkEditorBaseControllerTest, FolderAdded) {
 
 // Verifies expandeNodes and getExpandedNodes.
 TEST_F(BookmarkEditorBaseControllerTest, ExpandedState) {
-  BookmarkModel& model(*(browser_helper_.profile()->GetBookmarkModel()));
+  BookmarkModel& model(*(profile()->GetBookmarkModel()));
 
   // Sets up the state we're going to expand.
   BookmarkExpandedStateTracker::Nodes nodes;
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller_unittest.mm
index 3edba7b..d30bd6b 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller_unittest.mm
@@ -9,15 +9,13 @@
 #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/browser_test_helper.h"
-#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
+#include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #import "testing/gtest_mac.h"
 #include "testing/platform_test.h"
 
-class BookmarkEditorControllerTest : public CocoaTest {
+class BookmarkEditorControllerTest : public CocoaProfileTest {
  public:
-  BrowserTestHelper browser_helper_;
   const BookmarkNode* default_node_;
   const BookmarkNode* default_parent_;
   const char* default_name_;
@@ -25,8 +23,10 @@ class BookmarkEditorControllerTest : public CocoaTest {
   BookmarkEditorController* controller_;
 
   virtual void SetUp() {
-    CocoaTest::SetUp();
-    BookmarkModel* model = browser_helper_.profile()->GetBookmarkModel();
+    CocoaProfileTest::SetUp();
+    ASSERT_TRUE(profile());
+
+    BookmarkModel* model = profile()->GetBookmarkModel();
     default_parent_ = model->bookmark_bar_node();
     default_name_ = "http://www.zim-bop-a-dee.com/";
     default_title_ = ASCIIToUTF16("ooh title");
@@ -35,7 +35,7 @@ class BookmarkEditorControllerTest : public CocoaTest {
                                                      GURL(default_name_));
     controller_ = [[BookmarkEditorController alloc]
                    initWithParentWindow:test_window()
-                                profile:browser_helper_.profile()
+                                profile:profile()
                                  parent:default_parent_
                                    node:default_node
                           configuration:BookmarkEditor::NO_TREE];
@@ -44,7 +44,7 @@ class BookmarkEditorControllerTest : public CocoaTest {
 
   virtual void TearDown() {
     controller_ = NULL;
-    CocoaTest::TearDown();
+    CocoaProfileTest::TearDown();
   }
 };
 
@@ -87,7 +87,7 @@ TEST_F(BookmarkEditorControllerTest, EditAndFixPrefix) {
 TEST_F(BookmarkEditorControllerTest, NodeDeleted) {
   // Delete the bookmark being edited and verify the sheet cancels itself:
   ASSERT_TRUE([test_window() attachedSheet]);
-  BookmarkModel* model = browser_helper_.profile()->GetBookmarkModel();
+  BookmarkModel* model = profile()->GetBookmarkModel();
   model->Remove(default_parent_, 0);
   ASSERT_FALSE([test_window() attachedSheet]);
 }
@@ -130,18 +130,19 @@ TEST_F(BookmarkEditorControllerTest, GoodAndBadURLsChangeColor) {
   EXPECT_NSEQ(urlColorA, urlColorB);
 }
 
-class BookmarkEditorControllerNoNodeTest : public CocoaTest {
+class BookmarkEditorControllerNoNodeTest : public CocoaProfileTest {
  public:
-  BrowserTestHelper browser_helper_;
   BookmarkEditorController* controller_;
 
   virtual void SetUp() {
-    CocoaTest::SetUp();
-    BookmarkModel* model = browser_helper_.profile()->GetBookmarkModel();
+    CocoaProfileTest::SetUp();
+    ASSERT_TRUE(profile());
+
+    BookmarkModel* model = profile()->GetBookmarkModel();
     const BookmarkNode* parent = model->bookmark_bar_node();
     controller_ = [[BookmarkEditorController alloc]
                    initWithParentWindow:test_window()
-                                profile:browser_helper_.profile()
+                                profile:profile()
                                  parent:parent
                                    node:NULL
                           configuration:BookmarkEditor::NO_TREE];
@@ -151,7 +152,7 @@ class BookmarkEditorControllerNoNodeTest : public CocoaTest {
 
   virtual void TearDown() {
     controller_ = NULL;
-    CocoaTest::TearDown();
+    CocoaProfileTest::TearDown();
   }
 };
 
@@ -162,16 +163,17 @@ TEST_F(BookmarkEditorControllerNoNodeTest, NoNodeNoTree) {
   [controller_ cancel:nil];
 }
 
-class BookmarkEditorControllerYesNodeTest : public CocoaTest {
+class BookmarkEditorControllerYesNodeTest : public CocoaProfileTest {
  public:
-  BrowserTestHelper browser_helper_;
   string16 default_title_;
   const char* url_name_;
   BookmarkEditorController* controller_;
 
   virtual void SetUp() {
-    CocoaTest::SetUp();
-    BookmarkModel* model = browser_helper_.profile()->GetBookmarkModel();
+    CocoaProfileTest::SetUp();
+    ASSERT_TRUE(profile());
+
+    BookmarkModel* model = profile()->GetBookmarkModel();
     const BookmarkNode* parent = model->bookmark_bar_node();
     default_title_ = ASCIIToUTF16("wooh title");
     url_name_ = "http://www.zoom-baby-doo-da.com/";
@@ -179,7 +181,7 @@ class BookmarkEditorControllerYesNodeTest : public CocoaTest {
                                              GURL(url_name_));
     controller_ = [[BookmarkEditorController alloc]
                    initWithParentWindow:test_window()
-                                profile:browser_helper_.profile()
+                                profile:profile()
                                  parent:parent
                                    node:node
                           configuration:BookmarkEditor::NO_TREE];
@@ -189,7 +191,7 @@ class BookmarkEditorControllerYesNodeTest : public CocoaTest {
 
   virtual void TearDown() {
     controller_ = NULL;
-    CocoaTest::TearDown();
+    CocoaProfileTest::TearDown();
   }
 };
 
@@ -202,10 +204,9 @@ TEST_F(BookmarkEditorControllerYesNodeTest, YesNodeShowTree) {
   [controller_ cancel:nil];
 }
 
-class BookmarkEditorControllerTreeTest : public CocoaTest {
+class BookmarkEditorControllerTreeTest : public CocoaProfileTest {
 
  public:
-  BrowserTestHelper browser_helper_;
   BookmarkEditorController* controller_;
   const BookmarkNode* folder_a_;
   const BookmarkNode* folder_b_;
@@ -215,7 +216,7 @@ class BookmarkEditorControllerTreeTest : public CocoaTest {
   GURL bb3_url_1_;
   GURL bb3_url_2_;
 
-  BookmarkEditorControllerTreeTest() {
+  void CreateModel() {
     // Set up a small bookmark hierarchy, which will look as follows:
     //    a      b      c    d
     //     a-0    b-0    c-0
@@ -226,7 +227,7 @@ class BookmarkEditorControllerTreeTest : public CocoaTest {
     //             bb-4
     //            b-1
     //            b-2
-    BookmarkModel& model(*(browser_helper_.profile()->GetBookmarkModel()));
+    BookmarkModel& model(*(profile()->GetBookmarkModel()));
     const BookmarkNode* root = model.bookmark_bar_node();
     folder_a_ = model.AddFolder(root, 0, ASCIIToUTF16("a"));
     model.AddURL(folder_a_, 0, ASCIIToUTF16("a-0"), GURL("http://a-0.com"));
@@ -263,20 +264,24 @@ class BookmarkEditorControllerTreeTest : public CocoaTest {
   virtual BookmarkEditorController* CreateController() {
     return [[BookmarkEditorController alloc]
                initWithParentWindow:test_window()
-                            profile:browser_helper_.profile()
+                            profile:profile()
                              parent:folder_bb_
                                node:bookmark_bb_3_
                       configuration:BookmarkEditor::SHOW_TREE];
   }
 
   virtual void SetUp() {
+    CocoaProfileTest::SetUp();
+    ASSERT_TRUE(profile());
+
+    CreateModel();
     controller_ = CreateController();
     [controller_ runAsModalSheet];
   }
 
   virtual void TearDown() {
     controller_ = NULL;
-    CocoaTest::TearDown();
+    CocoaProfileTest::TearDown();
   }
 
   // After changing a node, pointers to the node may be invalid.  This
@@ -286,7 +291,7 @@ class BookmarkEditorControllerTreeTest : public CocoaTest {
   // bookmark_bb_3_ so that it points to the new node for testing.
   void UpdateBB3() {
     std::vector<const BookmarkNode*> nodes;
-    BookmarkModel* model = browser_helper_.profile()->GetBookmarkModel();
+    BookmarkModel* model = profile()->GetBookmarkModel();
     model->GetNodesByURL(bb3_url_1_, &nodes);
     if (nodes.empty())
       model->GetNodesByURL(bb3_url_2_, &nodes);
@@ -297,7 +302,7 @@ class BookmarkEditorControllerTreeTest : public CocoaTest {
 };
 
 TEST_F(BookmarkEditorControllerTreeTest, VerifyBookmarkTestModel) {
-  BookmarkModel& model(*(browser_helper_.profile()->GetBookmarkModel()));
+  BookmarkModel& model(*(profile()->GetBookmarkModel()));
   model.root_node();
   const BookmarkNode& root(*model.bookmark_bar_node());
   EXPECT_EQ(4, root.child_count());
@@ -404,7 +409,7 @@ class BookmarkEditorControllerTreeNoNodeTest :
   virtual BookmarkEditorController* CreateController() {
     return [[BookmarkEditorController alloc]
                initWithParentWindow:test_window()
-                            profile:browser_helper_.profile()
+                            profile:profile()
                              parent:folder_bb_
                                node:nil
                       configuration:BookmarkEditor::SHOW_TREE];
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target_unittest.mm
index fd61a35..ee1177b 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target_unittest.mm
@@ -7,8 +7,7 @@
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h"
 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.h"
-#include "chrome/browser/ui/cocoa/browser_test_helper.h"
-#include "chrome/browser/ui/cocoa/cocoa_test_helper.h"
+#include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 #import "third_party/ocmock/OCMock/OCMock.h"
@@ -30,14 +29,16 @@
 @end
 
 
-class BookmarkFolderTargetTest : public CocoaTest {
+class BookmarkFolderTargetTest : public CocoaProfileTest {
  public:
-  BookmarkFolderTargetTest() {
-    BookmarkModel* model = helper_.profile()->GetBookmarkModel();
+  virtual void SetUp() {
+    CocoaProfileTest::SetUp();
+    ASSERT_TRUE(profile());
+
+    BookmarkModel* model = profile()->GetBookmarkModel();
     bmbNode_ = model->bookmark_bar_node();
   }
 
-  BrowserTestHelper helper_;
   const BookmarkNode* bmbNode_;
 };
 
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm
index d973a6a..e96e943 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm
@@ -11,7 +11,7 @@
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h"
-#include "chrome/browser/ui/cocoa/browser_test_helper.h"
+#include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #include "grit/generated_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #import "testing/gtest_mac.h"
@@ -38,13 +38,15 @@ class TestBookmarkMenuBridge : public BookmarkMenuBridge {
 };
 
 // TODO(jrg): see refactor comment in bookmark_bar_state_controller_unittest.mm
-class BookmarkMenuBridgeTest : public PlatformTest {
+class BookmarkMenuBridgeTest : public CocoaProfileTest {
  public:
 
-   void SetUp() {
+   virtual void SetUp() {
+     CocoaProfileTest::SetUp();
+     ASSERT_TRUE(profile());
+
      NSMenu* menu = [[NSMenu alloc] initWithTitle:@"test"];
-     bridge_.reset(new TestBookmarkMenuBridge(browser_test_helper_.profile(),
-                   menu));
+     bridge_.reset(new TestBookmarkMenuBridge(profile(), menu));
      EXPECT_TRUE(bridge_.get());
    }
 
@@ -87,7 +89,6 @@ class BookmarkMenuBridgeTest : public PlatformTest {
     [menu addItem:item];
     return item;
   }
-  BrowserTestHelper browser_test_helper_;
   scoped_ptr<TestBookmarkMenuBridge> bridge_;
 };
 
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller_unittest.mm
index 8ae8a46..a0e7492 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller_unittest.mm
@@ -3,31 +3,31 @@
 // found in the LICENSE file.
 
 #include "base/string16.h"
+#import "base/memory/scoped_nsobject.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/ui/browser.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h"
-#include "chrome/browser/ui/cocoa/browser_test_helper.h"
+#include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 @interface FakeBookmarkMenuController : BookmarkMenuCocoaController {
  @public
-  BrowserTestHelper* helper_;
   const BookmarkNode* nodes_[2];
   BOOL opened_[2];
   BOOL opened_new_foreground_tab;
   BOOL opened_new_window;
   BOOL opened_off_the_record;
 }
+- (id)initWithProfile:(Profile*)profile;
 @end
 
 @implementation FakeBookmarkMenuController
 
-- (id)init {
+- (id)initWithProfile:(Profile*)profile {
   if ((self = [super init])) {
     string16 empty;
-    helper_ = new BrowserTestHelper();
-    BookmarkModel* model = helper_->browser()->profile()->GetBookmarkModel();
+    BookmarkModel* model = profile->GetBookmarkModel();
     const BookmarkNode* bookmark_bar = model->bookmark_bar_node();
     nodes_[0] = model->AddURL(bookmark_bar, 0, empty, GURL("http://0.com"));
     nodes_[1] = model->AddURL(bookmark_bar, 1, empty, GURL("http://1.com"));
@@ -35,11 +35,6 @@
   return self;
 }
 
-- (void)dealloc {
-  delete helper_;
-  [super dealloc];
-}
-
 - (const BookmarkNode*)nodeForIdentifier:(int)identifier {
   if ((identifier < 0) || (identifier >= 2))
     return NULL;
@@ -67,9 +62,24 @@
 
 @end  // FakeBookmarkMenuController
 
+class BookmarkMenuCocoaControllerTest : public CocoaProfileTest {
+ public:
+  virtual void SetUp() {
+    CocoaProfileTest::SetUp();
+    ASSERT_TRUE(profile());
+
+    controller_.reset(
+        [[FakeBookmarkMenuController alloc] initWithProfile:profile()]);
+  }
 
-TEST(BookmarkMenuCocoaControllerTest, TestOpenItem) {
-  FakeBookmarkMenuController *c = [[FakeBookmarkMenuController alloc] init];
+  FakeBookmarkMenuController* controller() { return controller_.get(); }
+
+ private:
+  scoped_nsobject<FakeBookmarkMenuController> controller_;
+};
+
+TEST_F(BookmarkMenuCocoaControllerTest, TestOpenItem) {
+  FakeBookmarkMenuController* c = controller();
   NSMenuItem *item = [[[NSMenuItem alloc] init] autorelease];
   for (int i = 0; i < 2; i++) {
     [item setTag:i];
@@ -92,6 +102,4 @@ TEST(BookmarkMenuCocoaControllerTest, TestOpenItem) {
   EXPECT_EQ(c->opened_off_the_record, NO);
   [c openAllBookmarksIncognitoWindow:item];
   EXPECT_NE(c->opened_off_the_record, NO);
-
-  [c release];
 }
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa_unittest.mm
index e6ab460..371b4cc 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa_unittest.mm
@@ -8,8 +8,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h"
-#import "chrome/browser/ui/cocoa/browser_test_helper.h"
-#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
+#import "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 
 // Keep track of bookmark pings.
 @interface ObserverPingTracker : NSObject {
@@ -26,19 +25,12 @@
 
 namespace {
 
-class BookmarkModelObserverForCocoaTest : public CocoaTest {
- public:
-  BrowserTestHelper helper_;
-
-  BookmarkModelObserverForCocoaTest() {}
-  virtual ~BookmarkModelObserverForCocoaTest() {}
- private:
-  DISALLOW_COPY_AND_ASSIGN(BookmarkModelObserverForCocoaTest);
+class BookmarkModelObserverForCocoaTest : public CocoaProfileTest {
 };
 
 
 TEST_F(BookmarkModelObserverForCocoaTest, TestCallback) {
-  BookmarkModel* model = helper_.profile()->GetBookmarkModel();
+  BookmarkModel* model = profile()->GetBookmarkModel();
   const BookmarkNode* node = model->AddURL(model->bookmark_bar_node(),
                                            0, ASCIIToUTF16("super"),
                                            GURL("http://www.google.com"));
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm
index 08c15e0..705e14e 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm
@@ -7,28 +7,25 @@
 #include "base/memory/scoped_nsobject.h"
 #include "base/utf_string_conversions.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.h"
-#include "chrome/browser/ui/cocoa/browser_test_helper.h"
-#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
+#include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #import "testing/gtest_mac.h"
 #include "testing/platform_test.h"
 
-class BookmarkNameFolderControllerTest : public CocoaTest {
- public:
-  BrowserTestHelper helper_;
+class BookmarkNameFolderControllerTest : public CocoaProfileTest {
 };
 
 
 // Simple add of a node (at the end).
 TEST_F(BookmarkNameFolderControllerTest, AddNew) {
-  BookmarkModel* model = helper_.profile()->GetBookmarkModel();
+  BookmarkModel* model = profile()->GetBookmarkModel();
   const BookmarkNode* parent = model->bookmark_bar_node();
   EXPECT_EQ(0, parent->child_count());
 
   scoped_nsobject<BookmarkNameFolderController>
     controller([[BookmarkNameFolderController alloc]
                  initWithParentWindow:test_window()
-                              profile:helper_.profile()
+                              profile:profile()
                                parent:parent
                              newIndex:0]);
   [controller window];  // force nib load
@@ -51,7 +48,7 @@ TEST_F(BookmarkNameFolderControllerTest, AddNew) {
 
 // Add new but specify a sibling.
 TEST_F(BookmarkNameFolderControllerTest, AddNewWithSibling) {
-  BookmarkModel* model = helper_.profile()->GetBookmarkModel();
+  BookmarkModel* model = profile()->GetBookmarkModel();
   const BookmarkNode* parent = model->bookmark_bar_node();
 
   // Add 2 nodes.  We will place the new folder in the middle of these.
@@ -64,7 +61,7 @@ TEST_F(BookmarkNameFolderControllerTest, AddNewWithSibling) {
   scoped_nsobject<BookmarkNameFolderController>
     controller([[BookmarkNameFolderController alloc]
                  initWithParentWindow:test_window()
-                              profile:helper_.profile()
+                              profile:profile()
                                parent:parent
                              newIndex:1]);
   [controller window];  // force nib load
@@ -81,14 +78,14 @@ TEST_F(BookmarkNameFolderControllerTest, AddNewWithSibling) {
 
 // Make sure we are allowed to create a folder named "New Folder".
 TEST_F(BookmarkNameFolderControllerTest, AddNewDefaultName) {
- BookmarkModel* model = helper_.profile()->GetBookmarkModel();
+ BookmarkModel* model = profile()->GetBookmarkModel();
   const BookmarkNode* parent = model->bookmark_bar_node();
   EXPECT_EQ(0, parent->child_count());
 
   scoped_nsobject<BookmarkNameFolderController>
     controller([[BookmarkNameFolderController alloc]
                  initWithParentWindow:test_window()
-                              profile:helper_.profile()
+                              profile:profile()
                                parent:parent
                              newIndex:0]);
 
@@ -102,14 +99,14 @@ TEST_F(BookmarkNameFolderControllerTest, AddNewDefaultName) {
 
 // Make sure we are allowed to create a folder with an empty name.
 TEST_F(BookmarkNameFolderControllerTest, AddNewBlankName) {
-  BookmarkModel* model = helper_.profile()->GetBookmarkModel();
+  BookmarkModel* model = profile()->GetBookmarkModel();
   const BookmarkNode* parent = model->bookmark_bar_node();
   EXPECT_EQ(0, parent->child_count());
 
   scoped_nsobject<BookmarkNameFolderController>
   controller([[BookmarkNameFolderController alloc]
               initWithParentWindow:test_window()
-                           profile:helper_.profile()
+                           profile:profile()
                             parent:parent
                           newIndex:0]);
   [controller window];  // force nib load
@@ -122,7 +119,7 @@ TEST_F(BookmarkNameFolderControllerTest, AddNewBlankName) {
 }
 
 TEST_F(BookmarkNameFolderControllerTest, Rename) {
-  BookmarkModel* model = helper_.profile()->GetBookmarkModel();
+  BookmarkModel* model = profile()->GetBookmarkModel();
   const BookmarkNode* parent = model->bookmark_bar_node();
   const BookmarkNode* folder = model->AddFolder(parent,
                                                 parent->child_count(),
@@ -133,7 +130,7 @@ TEST_F(BookmarkNameFolderControllerTest, Rename) {
   scoped_nsobject<BookmarkNameFolderController>
     controller([[BookmarkNameFolderController alloc]
                  initWithParentWindow:test_window()
-                              profile:helper_.profile()
+                              profile:profile()
                                  node:folder]);
   [controller window];  // force nib load
 
@@ -146,14 +143,14 @@ TEST_F(BookmarkNameFolderControllerTest, Rename) {
 }
 
 TEST_F(BookmarkNameFolderControllerTest, EditAndConfirmOKButton) {
-  BookmarkModel* model = helper_.profile()->GetBookmarkModel();
+  BookmarkModel* model = profile()->GetBookmarkModel();
   const BookmarkNode* parent = model->bookmark_bar_node();
   EXPECT_EQ(0, parent->child_count());
 
   scoped_nsobject<BookmarkNameFolderController>
     controller([[BookmarkNameFolderController alloc]
                  initWithParentWindow:test_window()
-                              profile:helper_.profile()
+                              profile:profile()
                                parent:parent
                              newIndex:0]);
   [controller window];  // force nib load
diff --git a/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller_unittest.mm b/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller_unittest.mm
index 8407187..f38b8d6 100644
--- a/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller_unittest.mm
@@ -7,8 +7,7 @@
 #include "base/memory/scoped_nsobject.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/search_engines/template_url.h"
-#include "chrome/browser/ui/cocoa/browser_test_helper.h"
-#include "chrome/browser/ui/cocoa/cocoa_test_helper.h"
+#include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #include "chrome/test/base/testing_profile.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
@@ -52,15 +51,15 @@
 
 namespace {
 
-class EditSearchEngineControllerTest : public CocoaTest {
+class EditSearchEngineControllerTest : public CocoaProfileTest {
  public:
    virtual void SetUp() {
-     CocoaTest::SetUp();
-     TestingProfile* profile =
-          static_cast<TestingProfile*>(browser_helper_.profile());
-     profile->CreateTemplateURLService();
+     CocoaProfileTest::SetUp();
+     ASSERT_TRUE(profile());
+
+     profile()->CreateTemplateURLService();
      controller_ =
-        [[FakeEditSearchEngineController alloc] initWithProfile:profile
+        [[FakeEditSearchEngineController alloc] initWithProfile:profile()
                                                        delegate:nil
                                                     templateURL:nil];
    }
@@ -72,10 +71,9 @@ class EditSearchEngineControllerTest : public CocoaTest {
     ASSERT_TRUE([controller_ window]);
 
     [controller_ close];
-    CocoaTest::TearDown();
+    CocoaProfileTest::TearDown();
   }
 
-  BrowserTestHelper browser_helper_;
   FakeEditSearchEngineController* controller_;
 };
 
@@ -214,9 +212,8 @@ TEST_F(EditSearchEngineControllerTest, EditTemplateURL) {
   std::string urlString = TemplateURLRef::DisplayURLToURLRef(
       ASCIIToUTF16("http://foo-bar.com"));
   url.SetURL(urlString, 0, 1);
-  TestingProfile* profile = browser_helper_.profile();
   FakeEditSearchEngineController *controller =
-      [[FakeEditSearchEngineController alloc] initWithProfile:profile
+      [[FakeEditSearchEngineController alloc] initWithProfile:profile()
                                                      delegate:nil
                                                   templateURL:&url];
   EXPECT_TRUE([controller window]);
diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa_unittest.mm b/chrome/browser/ui/cocoa/browser_window_cocoa_unittest.mm
index 66fbda3..3a61e62 100644
--- a/chrome/browser/ui/cocoa/browser_window_cocoa_unittest.mm
+++ b/chrome/browser/ui/cocoa/browser_window_cocoa_unittest.mm
@@ -6,10 +6,9 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
-#include "chrome/browser/ui/cocoa/browser_test_helper.h"
 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h"
 #include "chrome/browser/ui/cocoa/browser_window_controller.h"
-#include "chrome/browser/ui/cocoa/cocoa_test_helper.h"
+#include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -37,50 +36,50 @@ class BrowserWindowCocoaPong : public BrowserWindowCocoa {
 };
 
 // Main test class.
-class BrowserWindowCocoaTest : public CocoaTest {
+class BrowserWindowCocoaTest : public CocoaProfileTest {
   virtual void SetUp() {
-    CocoaTest::SetUp();
-    Browser* browser = browser_helper_.browser();
-    controller_ = [[BrowserWindowController alloc] initWithBrowser:browser
+    CocoaProfileTest::SetUp();
+    ASSERT_TRUE(browser());
+
+    controller_ = [[BrowserWindowController alloc] initWithBrowser:browser()
                                                      takeOwnership:NO];
   }
 
   virtual void TearDown() {
     [controller_ close];
-    CocoaTest::TearDown();
+    CocoaProfileTest::TearDown();
   }
 
  public:
-  BrowserTestHelper browser_helper_;
   BrowserWindowController* controller_;
 };
 
 
 TEST_F(BrowserWindowCocoaTest, TestNotification) {
   BrowserWindowCocoaPong *bwc =
-      new BrowserWindowCocoaPong(browser_helper_.browser(), controller_);
+      new BrowserWindowCocoaPong(browser(), controller_);
 
   EXPECT_FALSE(bwc->pong_);
-  bookmark_utils::ToggleWhenVisible(browser_helper_.profile());
+  bookmark_utils::ToggleWhenVisible(profile());
   // Confirm we are listening
   EXPECT_TRUE(bwc->pong_);
   delete bwc;
   // If this does NOT crash it confirms we stopped listening in the destructor.
-  bookmark_utils::ToggleWhenVisible(browser_helper_.profile());
+  bookmark_utils::ToggleWhenVisible(profile());
 }
 
 
 TEST_F(BrowserWindowCocoaTest, TestBookmarkBarVisible) {
   BrowserWindowCocoaPong *bwc = new BrowserWindowCocoaPong(
-    browser_helper_.browser(),
+    browser(),
     controller_);
   scoped_ptr<BrowserWindowCocoaPong> scoped_bwc(bwc);
 
   bool before = bwc->IsBookmarkBarVisible();
-  bookmark_utils::ToggleWhenVisible(browser_helper_.profile());
+  bookmark_utils::ToggleWhenVisible(profile());
   EXPECT_NE(before, bwc->IsBookmarkBarVisible());
 
-  bookmark_utils::ToggleWhenVisible(browser_helper_.profile());
+  bookmark_utils::ToggleWhenVisible(profile());
   EXPECT_EQ(before, bwc->IsBookmarkBarVisible());
 }
 
@@ -104,8 +103,8 @@ TEST_F(BrowserWindowCocoaTest, TestFullscreen) {
   // windowWillClose: never gets called).
   scoped_nsobject<FakeController> fake_controller(
       [[FakeController alloc] init]);
-  BrowserWindowCocoaPong *bwc = new BrowserWindowCocoaPong(
-    browser_helper_.browser(),
+  BrowserWindowCocoaPong* bwc = new BrowserWindowCocoaPong(
+    browser(),
     (BrowserWindowController*)fake_controller.get());
   scoped_ptr<BrowserWindowCocoaPong> scoped_bwc(bwc);
 
diff --git a/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm b/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm
index 0a99597..f11ab51 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm
@@ -10,9 +10,8 @@
 #include "chrome/browser/sync/sync_ui_util.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
-#include "chrome/browser/ui/cocoa/browser_test_helper.h"
 #include "chrome/browser/ui/cocoa/browser_window_controller.h"
-#include "chrome/browser/ui/cocoa/cocoa_test_helper.h"
+#include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
@@ -63,27 +62,27 @@
 }
 @end
 
-class BrowserWindowControllerTest : public CocoaTest {
+class BrowserWindowControllerTest : public CocoaProfileTest {
  public:
   virtual void SetUp() {
-    CocoaTest::SetUp();
-    Browser* browser = browser_helper_.browser();
-    controller_ = [[BrowserWindowController alloc] initWithBrowser:browser
+    CocoaProfileTest::SetUp();
+    ASSERT_TRUE(browser());
+
+    controller_ = [[BrowserWindowController alloc] initWithBrowser:browser()
                                                      takeOwnership:NO];
   }
 
   virtual void TearDown() {
     [controller_ close];
-    CocoaTest::TearDown();
+    CocoaProfileTest::TearDown();
   }
 
  public:
-  BrowserTestHelper browser_helper_;
   BrowserWindowController* controller_;
 };
 
 TEST_F(BrowserWindowControllerTest, TestSaveWindowPosition) {
-  PrefService* prefs = browser_helper_.profile()->GetPrefs();
+  PrefService* prefs = profile()->GetPrefs();
   ASSERT_TRUE(prefs != NULL);
 
   // Check to make sure there is no existing pref for window placement.
@@ -94,7 +93,7 @@ TEST_F(BrowserWindowControllerTest, TestSaveWindowPosition) {
 
   // Ask the window to save its position, then check that a preference
   // exists.
-  BrowserList::SetLastActive(browser_helper_.browser());
+  BrowserList::SetLastActive(browser());
   [controller_ saveWindowPositionIfNeeded];
   browser_window_placement =
       prefs->GetDictionary(prefs::kBrowserWindowPlacement);
@@ -110,7 +109,7 @@ TEST_F(BrowserWindowControllerTest, TestFullScreenWindow) {
 
 TEST_F(BrowserWindowControllerTest, TestNormal) {
   // Force the bookmark bar to be shown.
-  browser_helper_.profile()->GetPrefs()->
+  profile()->GetPrefs()->
       SetBoolean(prefs::kShowBookmarkBar, true);
   [controller_ updateBookmarkBarVisibilityWithAnimation:NO];
 
@@ -123,7 +122,7 @@ TEST_F(BrowserWindowControllerTest, TestNormal) {
   // And make sure a controller for a pop-up window is not normal.
   // popup_browser will be owned by its window.
   Browser *popup_browser(Browser::CreateForType(Browser::TYPE_POPUP,
-                                                browser_helper_.profile()));
+                                                profile()));
   NSWindow *cocoaWindow = popup_browser->window()->GetNativeHandle();
   BrowserWindowController* controller =
       static_cast<BrowserWindowController*>([cocoaWindow windowController]);
@@ -137,7 +136,7 @@ TEST_F(BrowserWindowControllerTest, TestNormal) {
 
 TEST_F(BrowserWindowControllerTest, TestSetBounds) {
   // Create a normal browser with bounds smaller than the minimum.
-  Browser::CreateParams params(Browser::TYPE_TABBED, browser_helper_.profile());
+  Browser::CreateParams params(Browser::TYPE_TABBED, profile());
   params.initial_bounds = gfx::Rect(0, 0, 50, 50);
   Browser* browser = Browser::CreateWithParams(params);
   NSWindow *cocoaWindow = browser->window()->GetNativeHandle();
@@ -162,7 +161,7 @@ TEST_F(BrowserWindowControllerTest, TestSetBounds) {
 
 TEST_F(BrowserWindowControllerTest, TestSetBoundsPopup) {
   // Create a popup with bounds smaller than the minimum.
-  Browser::CreateParams params(Browser::TYPE_POPUP, browser_helper_.profile());
+  Browser::CreateParams params(Browser::TYPE_POPUP, profile());
   params.initial_bounds = gfx::Rect(0, 0, 50, 50);
   Browser* browser = Browser::CreateWithParams(params);
   NSWindow *cocoaWindow = browser->window()->GetNativeHandle();
@@ -194,7 +193,7 @@ TEST_F(BrowserWindowControllerTest, BookmarkBarControllerIndirection) {
 
   // Explicitly show the bar. Can't use bookmark_utils::ToggleWhenVisible()
   // because of the notification issues.
-  browser_helper_.profile()->GetPrefs()->
+  profile()->GetPrefs()->
       SetBoolean(prefs::kShowBookmarkBar, true);
 
   [controller_ updateBookmarkBarVisibilityWithAnimation:NO];
@@ -426,7 +425,7 @@ TEST_F(BrowserWindowControllerTest, TestResizeViews) {
 
 TEST_F(BrowserWindowControllerTest, TestResizeViewsWithBookmarkBar) {
   // Force a display of the bookmark bar.
-  browser_helper_.profile()->GetPrefs()->
+  profile()->GetPrefs()->
       SetBoolean(prefs::kShowBookmarkBar, true);
   [controller_ updateBookmarkBarVisibilityWithAnimation:NO];
 
@@ -472,7 +471,7 @@ TEST_F(BrowserWindowControllerTest, TestResizeViewsWithBookmarkBar) {
   CheckViewPositions(controller_);
 
   // Remove the bookmark bar and recheck
-  browser_helper_.profile()->GetPrefs()->
+  profile()->GetPrefs()->
       SetBoolean(prefs::kShowBookmarkBar, false);
   [controller_ resizeView:bookmark newHeight:0];
   CheckViewPositions(controller_);
@@ -487,8 +486,7 @@ TEST_F(BrowserWindowControllerTest, TestResizeViewsWithBookmarkBar) {
 TEST_F(BrowserWindowControllerTest, BookmarkBarIsSameWidth) {
   // Set the pref to the bookmark bar is visible when the toolbar is
   // first created.
-  browser_helper_.profile()->GetPrefs()->SetBoolean(
-      prefs::kShowBookmarkBar, true);
+  profile()->GetPrefs()->SetBoolean(prefs::kShowBookmarkBar, true);
 
   // Make sure the bookmark bar is the same width as the toolbar
   NSView* bookmarkBarView = [controller_ bookmarkView];
@@ -651,10 +649,11 @@ TEST_F(BrowserWindowControllerTest, TestStatusBubblePositioning) {
 }
 @end
 
-class BrowserWindowFullScreenControllerTest : public CocoaTest {
+class BrowserWindowFullScreenControllerTest : public CocoaProfileTest {
  public:
   virtual void SetUp() {
-    CocoaTest::SetUp();
+    CocoaProfileTest::SetUp();
+    ASSERT_TRUE(browser());
 
     // This test case crashes when run on Lion. Fail early.
     if (base::mac::IsOSLionOrLater()) {
@@ -662,19 +661,17 @@ class BrowserWindowFullScreenControllerTest : public CocoaTest {
       FAIL() << "This test crashes on Lion; http://crbug.com/93925";
     }
 
-    Browser* browser = browser_helper_.browser();
     controller_ =
-        [[BrowserWindowControllerFakeFullscreen alloc] initWithBrowser:browser
+        [[BrowserWindowControllerFakeFullscreen alloc] initWithBrowser:browser()
                                                          takeOwnership:NO];
   }
 
   virtual void TearDown() {
     [controller_ close];
-    CocoaTest::TearDown();
+    CocoaProfileTest::TearDown();
   }
 
  public:
-  BrowserTestHelper browser_helper_;
   BrowserWindowController* controller_;
 };
 
diff --git a/chrome/browser/ui/cocoa/browser_test_helper.h b/chrome/browser/ui/cocoa/cocoa_profile_test.h
index d2ced88..5c50c7c 100644
--- a/chrome/browser/ui/cocoa/browser_test_helper.h
+++ b/chrome/browser/ui/cocoa/cocoa_profile_test.h
@@ -2,13 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_COCOA_BROWSER_TEST_HELPER_H_
-#define CHROME_BROWSER_UI_COCOA_BROWSER_TEST_HELPER_H_
+#ifndef CHROME_BROWSER_UI_COCOA_PROFILE_TEST_H_
+#define CHROME_BROWSER_UI_COCOA_PROFILE_TEST_H_
 #pragma once
 
+#include "base/memory/scoped_ptr.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
+#include "chrome/test/base/testing_profile_manager.h"
+#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #include "content/browser/browser_thread.h"
 
 // Base class which contains a valid Browser*.  Lots of boilerplate to
@@ -25,29 +28,44 @@
 // chrome/browser), and use in non-Mac unit tests such as
 // back_forward_menu_model_unittest.cc,
 // navigation_controller_unittest.cc, ..
-class BrowserTestHelper {
+class CocoaProfileTest : public CocoaTest {
  public:
-  BrowserTestHelper();
-  virtual ~BrowserTestHelper();
+  CocoaProfileTest();
+  virtual ~CocoaProfileTest();
 
-  virtual TestingProfile* profile() const;
-  Browser* browser() const { return browser_.get(); }
+  // This constructs a a Browser and a TestingProfile. It is guaranteed to
+  // succeed, else it will ASSERT and cause the test to fail. Subclasses that
+  // do work in SetUp should ASSERT that either browser() or profile() are
+  // non-NULL before proceeding after the call to super (this).
+  virtual void SetUp();
+
+  virtual void TearDown();
+
+  TestingProfileManager* testing_profile_manager() {
+    return &profile_manager_;
+  }
+  TestingProfile* profile() { return profile_; }
+  Browser* browser() { return browser_.get(); }
 
   // Creates the browser window. To close this window call |CloseBrowserWindow|.
   // Do NOT call close directly on the window.
   BrowserWindow* CreateBrowserWindow();
 
   // Closes the window for this browser. This must only be called after
-  // CreateBrowserWindow().
+  // CreateBrowserWindow(). This will automatically be called as part of
+  // TearDown() if it's not been done already.
   void CloseBrowserWindow();
 
  private:
-  scoped_ptr<TestingProfile> profile_;
-  scoped_ptr<Browser> browser_;
   MessageLoopForUI message_loop_;
   BrowserThread ui_thread_;
+
+  TestingProfileManager profile_manager_;
+  TestingProfile* profile_;  // Weak; owned by profile_manager_.
+  scoped_ptr<Browser> browser_;
+
   scoped_ptr<BrowserThread> file_thread_;
   scoped_ptr<BrowserThread> io_thread_;
 };
 
-#endif  // CHROME_BROWSER_UI_COCOA_BROWSER_TEST_HELPER_H_
+#endif  // CHROME_BROWSER_UI_COCOA_PROFILE_TEST_H_
diff --git a/chrome/browser/ui/cocoa/browser_test_helper.cc b/chrome/browser/ui/cocoa/cocoa_profile_test.mm
index bf6029e..d816f40 100644
--- a/chrome/browser/ui/cocoa/browser_test_helper.cc
+++ b/chrome/browser/ui/cocoa/cocoa_profile_test.mm
@@ -2,32 +2,30 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/cocoa/browser_test_helper.h"
+#include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 
-BrowserTestHelper::BrowserTestHelper()
+#include "chrome/browser/browser_process.h"
+#include "chrome/test/base/testing_browser_process.h"
+
+CocoaProfileTest::CocoaProfileTest()
     : ui_thread_(BrowserThread::UI, &message_loop_),
+      profile_manager_(static_cast<TestingBrowserProcess*>(g_browser_process)),
+      profile_(NULL),
       file_thread_(new BrowserThread(BrowserThread::FILE, &message_loop_)),
       io_thread_(new BrowserThread(BrowserThread::IO, &message_loop_)) {
-  profile_.reset(new TestingProfile());
-  profile_->CreateBookmarkModel(true);
-  profile_->BlockUntilBookmarkModelLoaded();
-
-  // TODO(shess): These are needed in case someone creates a browser
-  // window off of browser_.  pkasting indicates that other
-  // platforms use a stub |BrowserWindow| and thus don't need to do
-  // this.
-  // http://crbug.com/39725
-  profile_->CreateAutocompleteClassifier();
-  profile_->CreateTemplateURLService();
-
-  browser_.reset(new Browser(Browser::TYPE_TABBED, profile_.get()));
 }
 
-BrowserTestHelper::~BrowserTestHelper() {
+CocoaProfileTest::~CocoaProfileTest() {
   // Delete the testing profile on the UI thread. But first release the
   // browser, since it may trigger accesses to the profile upon destruction.
   browser_.reset();
-  message_loop_.DeleteSoon(FROM_HERE, profile_.release());
+
+  // Some services created on the TestingProfile require deletion on the UI
+  // thread. If the scoper in TestingBrowserProcess, owned by ChromeTestSuite,
+  // were to delete the ProfileManager, the UI thread would at that point no
+  // longer exist.
+  static_cast<TestingBrowserProcess*>(g_browser_process)->SetProfileManager(
+      NULL);
 
   // Make sure any pending tasks run before we destroy other threads.
   message_loop_.RunAllPending();
@@ -39,16 +37,42 @@ BrowserTestHelper::~BrowserTestHelper() {
   message_loop_.RunAllPending();
 }
 
-TestingProfile* BrowserTestHelper::profile() const {
-  return profile_.get();
+void CocoaProfileTest::SetUp() {
+  CocoaTest::SetUp();
+
+  ASSERT_TRUE(profile_manager_.SetUp());
+
+  profile_ = profile_manager_.CreateTestingProfile("default");
+  ASSERT_TRUE(profile_);
+
+  profile_->CreateBookmarkModel(true);
+  profile_->BlockUntilBookmarkModelLoaded();
+
+  // TODO(shess): These are needed in case someone creates a browser
+  // window off of browser_.  pkasting indicates that other
+  // platforms use a stub |BrowserWindow| and thus don't need to do
+  // this.
+  // http://crbug.com/39725
+  profile_->CreateAutocompleteClassifier();
+  profile_->CreateTemplateURLService();
+
+  browser_.reset(new Browser(Browser::TYPE_TABBED, profile_));
+  ASSERT_TRUE(browser_.get());
+}
+
+void CocoaProfileTest::TearDown() {
+  if (browser_.get() && browser_->window())
+    CloseBrowserWindow();
+
+  CocoaTest::TearDown();
 }
 
-BrowserWindow* BrowserTestHelper::CreateBrowserWindow() {
+BrowserWindow* CocoaProfileTest::CreateBrowserWindow() {
   browser_->InitBrowserWindow();
   return browser_->window();
 }
 
-void BrowserTestHelper::CloseBrowserWindow() {
+void CocoaProfileTest::CloseBrowserWindow() {
   // Check to make sure a window was actually created.
   DCHECK(browser_->window());
   browser_->CloseAllTabs();
diff --git a/chrome/browser/ui/cocoa/download/download_shelf_mac_unittest.mm b/chrome/browser/ui/cocoa/download/download_shelf_mac_unittest.mm
index 64b0efb..114d0c0 100644
--- a/chrome/browser/ui/cocoa/download/download_shelf_mac_unittest.mm
+++ b/chrome/browser/ui/cocoa/download/download_shelf_mac_unittest.mm
@@ -3,8 +3,7 @@
 // found in the LICENSE file.
 
 #import "base/memory/scoped_nsobject.h"
-#include "chrome/browser/ui/cocoa/browser_test_helper.h"
-#include "chrome/browser/ui/cocoa/cocoa_test_helper.h"
+#include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #include "chrome/browser/ui/cocoa/download/download_shelf_mac.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
@@ -46,27 +45,26 @@
 
 namespace {
 
-class DownloadShelfMacTest : public CocoaTest {
+class DownloadShelfMacTest : public CocoaProfileTest {
 
   virtual void SetUp() {
-    CocoaTest::SetUp();
+    CocoaProfileTest::SetUp();
     shelf_controller_.reset([[FakeDownloadShelfController alloc] init]);
   }
 
  protected:
   scoped_nsobject<FakeDownloadShelfController> shelf_controller_;
-  BrowserTestHelper browser_helper_;
 };
 
 TEST_F(DownloadShelfMacTest, CreationDoesNotCallShow) {
   // Also make sure the DownloadShelfMacTest constructor doesn't crash.
-  DownloadShelfMac shelf(browser_helper_.browser(),
+  DownloadShelfMac shelf(browser(),
       (DownloadShelfController*)shelf_controller_.get());
   EXPECT_EQ(0, shelf_controller_.get()->callCountShow);
 }
 
 TEST_F(DownloadShelfMacTest, ForwardsShow) {
-  DownloadShelfMac shelf(browser_helper_.browser(),
+  DownloadShelfMac shelf(browser(),
       (DownloadShelfController*)shelf_controller_.get());
   EXPECT_EQ(0, shelf_controller_.get()->callCountShow);
   shelf.Show();
@@ -74,7 +72,7 @@ TEST_F(DownloadShelfMacTest, ForwardsShow) {
 }
 
 TEST_F(DownloadShelfMacTest, ForwardsHide) {
-  DownloadShelfMac shelf(browser_helper_.browser(),
+  DownloadShelfMac shelf(browser(),
       (DownloadShelfController*)shelf_controller_.get());
   EXPECT_EQ(0, shelf_controller_.get()->callCountHide);
   shelf.Close();
@@ -82,7 +80,7 @@ TEST_F(DownloadShelfMacTest, ForwardsHide) {
 }
 
 TEST_F(DownloadShelfMacTest, ForwardsIsShowing) {
-  DownloadShelfMac shelf(browser_helper_.browser(),
+  DownloadShelfMac shelf(browser(),
       (DownloadShelfController*)shelf_controller_.get());
   EXPECT_EQ(0, shelf_controller_.get()->callCountIsVisible);
   shelf.IsShowing();
diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller_unittest.mm b/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller_unittest.mm
index 32ab819..84cdadf 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller_unittest.mm
@@ -13,8 +13,7 @@
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #import "chrome/browser/extensions/extension_install_ui.h"
-#include "chrome/browser/ui/cocoa/browser_test_helper.h"
-#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
+#include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #import "chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension.h"
@@ -27,7 +26,7 @@
 
 
 // Base class for our tests.
-class ExtensionInstallDialogControllerTest : public CocoaTest {
+class ExtensionInstallDialogControllerTest : public CocoaProfileTest {
 public:
   ExtensionInstallDialogControllerTest() {
     PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_);
@@ -70,7 +69,6 @@ public:
     }
   }
 
-  BrowserTestHelper helper_;
   FilePath test_data_dir_;
   SkBitmap icon_;
   scoped_refptr<Extension> extension_;
@@ -115,7 +113,7 @@ TEST_F(ExtensionInstallDialogControllerTest, BasicsNormalCancel) {
   scoped_nsobject<ExtensionInstallDialogController>
     controller([[ExtensionInstallDialogController alloc]
                  initWithParentWindow:test_window()
-                              profile:helper_.profile()
+                              profile:profile()
                             extension:extension_.get()
                             delegate:&delegate
                                 icon:&icon_
@@ -170,7 +168,7 @@ TEST_F(ExtensionInstallDialogControllerTest, BasicsNormalOK) {
   scoped_nsobject<ExtensionInstallDialogController>
   controller([[ExtensionInstallDialogController alloc]
                initWithParentWindow:test_window()
-                            profile:helper_.profile()
+                            profile:profile()
                           extension:extension_.get()
                            delegate:&delegate
                                icon:&icon_
@@ -203,7 +201,7 @@ TEST_F(ExtensionInstallDialogControllerTest, MultipleWarnings) {
   scoped_nsobject<ExtensionInstallDialogController>
   controller1([[ExtensionInstallDialogController alloc]
                 initWithParentWindow:test_window()
-                             profile:helper_.profile()
+                             profile:profile()
                            extension:extension_.get()
                             delegate:&delegate1
                                 icon:&icon_
@@ -214,7 +212,7 @@ TEST_F(ExtensionInstallDialogControllerTest, MultipleWarnings) {
   scoped_nsobject<ExtensionInstallDialogController>
   controller2([[ExtensionInstallDialogController alloc]
                 initWithParentWindow:test_window()
-                             profile:helper_.profile()
+                             profile:profile()
                            extension:extension_.get()
                             delegate:&delegate2
                                 icon:&icon_
@@ -250,7 +248,7 @@ TEST_F(ExtensionInstallDialogControllerTest, BasicsSkinny) {
   scoped_nsobject<ExtensionInstallDialogController>
   controller([[ExtensionInstallDialogController alloc]
                initWithParentWindow:test_window()
-                            profile:helper_.profile()
+                            profile:profile()
                           extension:extension_.get()
                            delegate:&delegate
                                icon:&icon_
@@ -296,7 +294,7 @@ TEST_F(ExtensionInstallDialogControllerTest, BasicsInline) {
   scoped_nsobject<ExtensionInstallDialogController>
   controller([[ExtensionInstallDialogController alloc]
                initWithParentWindow:test_window()
-                            profile:helper_.profile()
+                            profile:profile()
                           extension:extension_.get()
                            delegate:&delegate
                                icon:&icon_
diff --git a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm
index 697ef5d..a9865ef 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm
@@ -11,8 +11,7 @@
 #include "base/path_service.h"
 #include "base/values.h"
 #import "chrome/browser/ui/browser_window.h"
-#import "chrome/browser/ui/cocoa/browser_test_helper.h"
-#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
+#include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #import "chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.h"
 #import "chrome/browser/ui/cocoa/info_bubble_window.h"
 #include "chrome/common/chrome_paths.h"
@@ -42,21 +41,16 @@
 
 namespace keys = extension_manifest_keys;
 
-class ExtensionInstalledBubbleControllerTest : public CocoaTest {
+class ExtensionInstalledBubbleControllerTest : public CocoaProfileTest {
 
  public:
   virtual void SetUp() {
-    CocoaTest::SetUp();
-    browser_ = helper_.browser();
-    window_ = helper_.CreateBrowserWindow()->GetNativeHandle();
+    CocoaProfileTest::SetUp();
+    ASSERT_TRUE(browser());
+    window_ = CreateBrowserWindow()->GetNativeHandle();
     icon_ = LoadTestIcon();
   }
 
-  virtual void TearDown() {
-    helper_.CloseBrowserWindow();
-    CocoaTest::TearDown();
-  }
-
   // Load test icon from extension test directory.
   SkBitmap LoadTestIcon() {
     FilePath path;
@@ -107,14 +101,8 @@ class ExtensionInstalledBubbleControllerTest : public CocoaTest {
                              Extension::STRICT_ERROR_CHECKS, &error);
   }
 
-  // Allows us to create the window and browser for testing.
-  BrowserTestHelper helper_;
-
-  // Required to initialize the extension installed bubble.
-  NSWindow* window_;  // weak, owned by BrowserTestHelper.
-
   // Required to initialize the extension installed bubble.
-  Browser* browser_;  // weak, owned by BrowserTestHelper.
+  NSWindow* window_;  // weak, owned by CocoaProfileTest.
 
   // Skeleton extension to be tested; reinitialized for each test.
   scoped_refptr<Extension> extension_;
@@ -130,7 +118,7 @@ TEST_F(ExtensionInstalledBubbleControllerTest, PageActionTest) {
       [[ExtensionInstalledBubbleControllerForTest alloc]
           initWithParentWindow:window_
                      extension:extension_.get()
-                       browser:browser_
+                       browser:browser()
                           icon:icon_];
   EXPECT_TRUE(controller);
 
@@ -173,7 +161,7 @@ TEST_F(ExtensionInstalledBubbleControllerTest, BrowserActionTest) {
       [[ExtensionInstalledBubbleControllerForTest alloc]
           initWithParentWindow:window_
                      extension:extension_.get()
-                       browser:browser_
+                       browser:browser()
                           icon:icon_];
   EXPECT_TRUE(controller);
 
@@ -210,7 +198,7 @@ TEST_F(ExtensionInstalledBubbleControllerTest, ParentClose) {
       [[ExtensionInstalledBubbleControllerForTest alloc]
           initWithParentWindow:window_
                      extension:extension_.get()
-                       browser:browser_
+                       browser:browser()
                           icon:icon_];
   EXPECT_TRUE(controller);
 
diff --git a/chrome/browser/ui/cocoa/extensions/extension_popup_controller_unittest.mm b/chrome/browser/ui/cocoa/extensions/extension_popup_controller_unittest.mm
index 8c15bee..88363dc 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_popup_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_popup_controller_unittest.mm
@@ -3,13 +3,14 @@
 // found in the LICENSE file.
 
 #include "base/memory/scoped_nsobject.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "chrome/browser/extensions/extension_pref_value_map.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_settings.h"
-#include "chrome/browser/ui/cocoa/browser_test_helper.h"
+#include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #include "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h"
 #include "chrome/test/base/testing_profile.h"
diff --git a/chrome/browser/ui/cocoa/first_run_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/first_run_bubble_controller_unittest.mm
index c0a72ad..601039c 100644
--- a/chrome/browser/ui/cocoa/first_run_bubble_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/first_run_bubble_controller_unittest.mm
@@ -8,15 +8,12 @@
 
 #include "base/debug/debugger.h"
 #include "base/memory/scoped_nsobject.h"
-#include "chrome/browser/ui/cocoa/browser_test_helper.h"
-#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
+#include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
-class FirstRunBubbleControllerTest : public CocoaTest {
- public:
-  BrowserTestHelper helper_;
+class FirstRunBubbleControllerTest : public CocoaProfileTest {
 };
 
 // Check that the bubble doesn't crash or leak.
@@ -35,7 +32,7 @@ TEST_F(FirstRunBubbleControllerTest, Init) {
   FirstRunBubbleController* controller = [FirstRunBubbleController
       showForView:[parent.get() contentView]
            offset:NSMakePoint(300, 300)
-          profile:helper_.profile()];
+          profile:profile()];
   EXPECT_TRUE(controller != nil);
   EXPECT_TRUE([[controller window] isVisible]);
   [parent.get() close];
diff --git a/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm b/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm
index 0696833..f39828f 100644
--- a/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm
+++ b/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm
@@ -12,8 +12,7 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
-#include "chrome/browser/ui/cocoa/browser_test_helper.h"
-#include "chrome/browser/ui/cocoa/cocoa_test_helper.h"
+#include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #include "chrome/browser/ui/cocoa/history_menu_bridge.h"
 #include "content/browser/cancelable_request.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ -43,13 +42,13 @@ class MockBridge : public HistoryMenuBridge {
   scoped_nsobject<NSMenu> menu_;
 };
 
-class HistoryMenuBridgeTest : public CocoaTest {
+class HistoryMenuBridgeTest : public CocoaProfileTest {
  public:
 
   virtual void SetUp() {
-    CocoaTest::SetUp();
-    browser_test_helper_.profile()->CreateFaviconService();
-    bridge_.reset(new MockBridge(browser_test_helper_.profile()));
+    CocoaProfileTest::SetUp();
+    profile()->CreateFaviconService();
+    bridge_.reset(new MockBridge(profile()));
   }
 
   // We are a friend of HistoryMenuBridge (and have access to
@@ -113,7 +112,6 @@ class HistoryMenuBridgeTest : public CocoaTest {
     return bridge_->favicon_consumer_;
   }
 
-  BrowserTestHelper browser_test_helper_;
   scoped_ptr<MockBridge> bridge_;
 };
 
@@ -210,7 +208,7 @@ TEST_F(HistoryMenuBridgeTest, AddItemToMenu) {
 
 // Test that the menu is created for a set of simple tabs.
 TEST_F(HistoryMenuBridgeTest, RecentlyClosedTabs) {
-  scoped_ptr<MockTRS> trs(new MockTRS(browser_test_helper_.profile()));
+  scoped_ptr<MockTRS> trs(new MockTRS(profile()));
   MockTRS::Entries entries;
 
   MockTRS::Tab tab1 = CreateSessionTab(GURL("http://google.com"),
@@ -246,7 +244,7 @@ TEST_F(HistoryMenuBridgeTest, RecentlyClosedTabs) {
 
 // Test that the menu is created for a mix of windows and tabs.
 TEST_F(HistoryMenuBridgeTest, RecentlyClosedTabsAndWindows) {
-  scoped_ptr<MockTRS> trs(new MockTRS(browser_test_helper_.profile()));
+  scoped_ptr<MockTRS> trs(new MockTRS(profile()));
   MockTRS::Entries entries;
 
   MockTRS::Tab tab1 = CreateSessionTab(GURL("http://google.com"),
diff --git a/chrome/browser/ui/cocoa/history_menu_cocoa_controller_unittest.mm b/chrome/browser/ui/cocoa/history_menu_cocoa_controller_unittest.mm
index 6442576..2250a46 100644
--- a/chrome/browser/ui/cocoa/history_menu_cocoa_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/history_menu_cocoa_controller_unittest.mm
@@ -7,8 +7,7 @@
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
-#include "chrome/browser/ui/cocoa/browser_test_helper.h"
-#include "chrome/browser/ui/cocoa/cocoa_test_helper.h"
+#include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #include "chrome/browser/ui/cocoa/history_menu_bridge.h"
 #include "chrome/browser/ui/cocoa/history_menu_cocoa_controller.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -35,12 +34,14 @@
 
 @end  // FakeHistoryMenuController
 
-class HistoryMenuCocoaControllerTest : public CocoaTest {
+class HistoryMenuCocoaControllerTest : public CocoaProfileTest {
  public:
 
   virtual void SetUp() {
-    CocoaTest::SetUp();
-    bridge_.reset(new HistoryMenuBridge(browser_test_helper_.profile()));
+    CocoaProfileTest::SetUp();
+    ASSERT_TRUE(profile());
+
+    bridge_.reset(new HistoryMenuBridge(profile()));
     bridge_->controller_.reset(
         [[FakeHistoryMenuController alloc] initWithBridge:bridge_.get()]);
     [controller() initTest];
@@ -67,7 +68,6 @@ class HistoryMenuCocoaControllerTest : public CocoaTest {
   }
 
  private:
-  BrowserTestHelper browser_test_helper_;
   scoped_ptr<HistoryMenuBridge> bridge_;
 };
 
diff --git a/chrome/browser/ui/cocoa/tabpose_window_unittest.mm b/chrome/browser/ui/cocoa/tabpose_window_unittest.mm
index 9f51763..23712f9 100644
--- a/chrome/browser/ui/cocoa/tabpose_window_unittest.mm
+++ b/chrome/browser/ui/cocoa/tabpose_window_unittest.mm
@@ -6,35 +6,35 @@
 
 #include "chrome/browser/tabs/tab_strip_model.h"
 #import "chrome/browser/ui/browser_window.h"
-#import "chrome/browser/ui/cocoa/browser_test_helper.h"
-#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
+#include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "content/browser/site_instance.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-class TabposeWindowTest : public CocoaTest {
+class TabposeWindowTest : public CocoaProfileTest {
  public:
-  TabposeWindowTest() {
-    site_instance_ =
-        SiteInstance::CreateSiteInstance(browser_helper_.profile());
+  virtual void SetUp() {
+    CocoaProfileTest::SetUp();
+    ASSERT_TRUE(profile());
+
+    site_instance_ = SiteInstance::CreateSiteInstance(profile());
   }
 
   void AppendTabToStrip() {
     TabContentsWrapper* tab_contents = Browser::TabContentsFactory(
-        browser_helper_.profile(), site_instance_, MSG_ROUTING_NONE,
+        profile(), site_instance_, MSG_ROUTING_NONE,
         NULL, NULL);
-    browser_helper_.browser()->tabstrip_model()->AppendTabContents(
+    browser()->tabstrip_model()->AppendTabContents(
         tab_contents, /*foreground=*/true);
   }
 
-  BrowserTestHelper browser_helper_;
   scoped_refptr<SiteInstance> site_instance_;
 };
 
 // Check that this doesn't leak.
 TEST_F(TabposeWindowTest, TestShow) {
-  BrowserWindow* browser_window = browser_helper_.CreateBrowserWindow();
+  BrowserWindow* browser_window = CreateBrowserWindow();
   NSWindow* parent = browser_window->GetNativeHandle();
 
   [parent orderFront:nil];
@@ -49,16 +49,14 @@ TEST_F(TabposeWindowTest, TestShow) {
       [TabposeWindow openTabposeFor:parent
                                rect:NSMakeRect(10, 20, 250, 160)
                               slomo:NO
-                     tabStripModel:browser_helper_.browser()->tabstrip_model()];
+                      tabStripModel:browser()->tabstrip_model()];
 
   // Should release the window.
   [window mouseDown:nil];
-
-  browser_helper_.CloseBrowserWindow();
 }
 
 TEST_F(TabposeWindowTest, TestModelObserver) {
-  BrowserWindow* browser_window = browser_helper_.CreateBrowserWindow();
+  BrowserWindow* browser_window = CreateBrowserWindow();
   NSWindow* parent = browser_window->GetNativeHandle();
   [parent orderFront:nil];
 
@@ -71,10 +69,10 @@ TEST_F(TabposeWindowTest, TestModelObserver) {
       [TabposeWindow openTabposeFor:parent
                                rect:NSMakeRect(10, 20, 250, 160)
                               slomo:NO
-                     tabStripModel:browser_helper_.browser()->tabstrip_model()];
+                      tabStripModel:browser()->tabstrip_model()];
 
   // Exercise all the model change events.
-  TabStripModel* model = browser_helper_.browser()->tabstrip_model();
+  TabStripModel* model = browser()->tabstrip_model();
   DCHECK_EQ([window thumbnailLayerCount], 3u);
   DCHECK_EQ([window selectedIndex], 2);
 
@@ -114,6 +112,4 @@ TEST_F(TabposeWindowTest, TestModelObserver) {
 
   // Should release the window.
   [window mouseDown:nil];
-
-  browser_helper_.CloseBrowserWindow();
 }
diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm
index 011a4f6..bb2db5d 100644
--- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm
@@ -7,8 +7,7 @@
 #include <vector>
 
 #import "chrome/browser/ui/browser_window.h"
-#include "chrome/browser/ui/cocoa/browser_test_helper.h"
-#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
+#include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #import "chrome/browser/ui/cocoa/new_tab_button.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"
@@ -99,11 +98,13 @@ class TestTabStripDelegate : public TabStripModelDelegate {
   virtual bool LargeIconsPermitted() const { return true; }
 };
 
-class TabStripControllerTest : public CocoaTest {
+class TabStripControllerTest : public CocoaProfileTest {
  public:
-  TabStripControllerTest() {
-    Browser* browser = browser_helper_.browser();
-    BrowserWindow* browser_window = browser_helper_.CreateBrowserWindow();
+  virtual void SetUp() {
+    CocoaProfileTest::SetUp();
+    ASSERT_TRUE(browser());
+
+    BrowserWindow* browser_window = CreateBrowserWindow();
     NSWindow* window = browser_window->GetNativeHandle();
     NSView* parent = [window contentView];
     NSRect content_frame = [parent frame];
@@ -129,25 +130,23 @@ class TabStripControllerTest : public CocoaTest {
     [tab_strip setNewTabButton:new_tab_button.get()];
 
     delegate_.reset(new TestTabStripDelegate());
-    model_ = browser->tabstrip_model();
+    model_ = browser()->tabstrip_model();
     controller_delegate_.reset([TestTabStripControllerDelegate alloc]);
     controller_.reset([[TabStripController alloc]
                         initWithView:static_cast<TabStripView*>(tab_strip.get())
                           switchView:switch_view.get()
-                             browser:browser
+                             browser:browser()
                             delegate:controller_delegate_.get()]);
   }
 
   virtual void TearDown() {
-    browser_helper_.CloseBrowserWindow();
     // The call to CocoaTest::TearDown() deletes the Browser and TabStripModel
     // objects, so we first have to delete the controller, which refers to them.
     controller_.reset();
     model_ = NULL;
-    CocoaTest::TearDown();
+    CocoaProfileTest::TearDown();
   }
 
-  BrowserTestHelper browser_helper_;
   scoped_ptr<TestTabStripDelegate> delegate_;
   TabStripModel* model_;
   scoped_nsobject<TestTabStripControllerDelegate> controller_delegate_;
@@ -158,10 +157,9 @@ class TabStripControllerTest : public CocoaTest {
 // the tab strip.
 TEST_F(TabStripControllerTest, AddRemoveTabs) {
   EXPECT_TRUE(model_->empty());
-  SiteInstance* instance =
-      SiteInstance::CreateSiteInstance(browser_helper_.profile());
+  SiteInstance* instance = SiteInstance::CreateSiteInstance(profile());
   TabContentsWrapper* tab_contents =
-      Browser::TabContentsFactory(browser_helper_.profile(), instance,
+      Browser::TabContentsFactory(profile(), instance,
           MSG_ROUTING_NONE, NULL, NULL);
   model_->AppendTabContents(tab_contents, true);
   EXPECT_EQ(model_->count(), 1);
diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller_unittest.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_controller_unittest.mm
index efdbb76..f840262 100644
--- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller_unittest.mm
@@ -6,8 +6,7 @@
 
 #import "base/memory/scoped_nsobject.h"
 #include "chrome/app/chrome_command_ids.h"
-#include "chrome/browser/ui/cocoa/browser_test_helper.h"
-#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
+#include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #import "chrome/browser/ui/cocoa/gradient_button_cell.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 #import "chrome/browser/ui/cocoa/view_resizer_pong.h"
@@ -37,7 +36,7 @@
 
 namespace {
 
-class ToolbarControllerTest : public CocoaTest {
+class ToolbarControllerTest : public CocoaProfileTest {
  public:
 
   // Indexes that match the ordering returned by the private ToolbarController
@@ -47,19 +46,21 @@ class ToolbarControllerTest : public CocoaTest {
     kWrenchIndex, kLocationIndex, kBrowserActionContainerViewIndex
   };
 
-  ToolbarControllerTest() {
-    Browser* browser = helper_.browser();
-    CommandUpdater* updater = browser->command_updater();
+  virtual void SetUp() {
+    CocoaProfileTest::SetUp();
+    ASSERT_TRUE(browser());
+
+    CommandUpdater* updater = browser()->command_updater();
     // The default state for the commands is true, set a couple to false to
     // ensure they get picked up correct on initialization
     updater->UpdateCommandEnabled(IDC_BACK, false);
     updater->UpdateCommandEnabled(IDC_FORWARD, false);
     resizeDelegate_.reset([[ViewResizerPong alloc] init]);
     bar_.reset(
-        [[ToolbarController alloc] initWithModel:browser->toolbar_model()
-                                        commands:browser->command_updater()
-                                         profile:helper_.profile()
-                                         browser:browser
+        [[ToolbarController alloc] initWithModel:browser()->toolbar_model()
+                                        commands:browser()->command_updater()
+                                         profile:profile()
+                                         browser:browser()
                                   resizeDelegate:resizeDelegate_.get()]);
     EXPECT_TRUE([bar_ view]);
     NSView* parent = [test_window() contentView];
@@ -79,7 +80,6 @@ class ToolbarControllerTest : public CocoaTest {
               [[views objectAtIndex:kHomeIndex] isEnabled] ? true : false);
   }
 
-  BrowserTestHelper helper_;
   scoped_nsobject<ViewResizerPong> resizeDelegate_;
   scoped_nsobject<ToolbarController> bar_;
 };
@@ -88,7 +88,7 @@ TEST_VIEW(ToolbarControllerTest, [bar_ view])
 
 // Test the initial state that everything is sync'd up
 TEST_F(ToolbarControllerTest, InitialState) {
-  CommandUpdater* updater = helper_.browser()->command_updater();
+  CommandUpdater* updater = browser()->command_updater();
   CompareState(updater, [bar_ toolbarViews]);
 }
 
@@ -130,7 +130,7 @@ TEST_F(ToolbarControllerTest, NoLocationBar) {
 // Make some changes to the enabled state of a few of the buttons and ensure
 // that we're still in sync.
 TEST_F(ToolbarControllerTest, UpdateEnabledState) {
-  CommandUpdater* updater = helper_.browser()->command_updater();
+  CommandUpdater* updater = browser()->command_updater();
   EXPECT_FALSE(updater->IsCommandEnabled(IDC_BACK));
   EXPECT_FALSE(updater->IsCommandEnabled(IDC_FORWARD));
   updater->UpdateCommandEnabled(IDC_BACK, true);
@@ -163,7 +163,7 @@ TEST_F(ToolbarControllerTest, LoadingState) {
 // Check that toggling the state of the home button changes the visible
 // state of the home button and moves the other items accordingly.
 TEST_F(ToolbarControllerTest, ToggleHome) {
-  PrefService* prefs = helper_.profile()->GetPrefs();
+  PrefService* prefs = profile()->GetPrefs();
   bool showHome = prefs->GetBoolean(prefs::kShowHomeButton);
   NSView* homeButton = [[bar_ toolbarViews] objectAtIndex:kHomeIndex];
   EXPECT_EQ(showHome, ![homeButton isHidden]);
diff --git a/chrome/browser/ui/cocoa/translate/translate_infobar_unittest.mm b/chrome/browser/ui/cocoa/translate/translate_infobar_unittest.mm
index 9e2aa6b..c3f096e 100644
--- a/chrome/browser/ui/cocoa/translate/translate_infobar_unittest.mm
+++ b/chrome/browser/ui/cocoa/translate/translate_infobar_unittest.mm
@@ -9,8 +9,7 @@
 #include "base/utf_string_conversions.h"
 #import "chrome/app/chrome_command_ids.h"  // For translate menu command ids.
 #import "chrome/browser/translate/translate_infobar_delegate.h"
-#import "chrome/browser/ui/cocoa/browser_test_helper.h"
-#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
+#include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar.h"
 #import "chrome/browser/ui/cocoa/translate/translate_infobar_base.h"
 #import "chrome/browser/ui/cocoa/translate/before_translate_infobar_controller.h"
@@ -66,9 +65,8 @@ class MockTranslateInfoBarDelegate : public TranslateInfoBarDelegate {
   MOCK_METHOD0(ToggleAlwaysTranslate, void());
 };
 
-class TranslationInfoBarTest : public CocoaTest {
+class TranslationInfoBarTest : public CocoaProfileTest {
  public:
-  BrowserTestHelper browser_helper_;
   scoped_ptr<TabContentsWrapper> tab_contents;
   scoped_ptr<MockTranslateInfoBarDelegate> infobar_delegate;
   scoped_nsobject<TranslateInfoBarControllerBase> infobar_controller;
@@ -77,9 +75,9 @@ class TranslationInfoBarTest : public CocoaTest {
   // Each test gets a single Mock translate delegate for the lifetime of
   // the test.
   virtual void SetUp() {
-    CocoaTest::SetUp();
-   tab_contents.reset(new TabContentsWrapper(new TabContents(
-       browser_helper_.profile(), NULL, MSG_ROUTING_NONE, NULL, NULL)));
+    CocoaProfileTest::SetUp();
+    tab_contents.reset(new TabContentsWrapper(new TabContents(
+       profile(), NULL, MSG_ROUTING_NONE, NULL, NULL)));
     CreateInfoBar();
   }
 
@@ -223,7 +221,7 @@ TEST_F(TranslationInfoBarTest, Bug36895) {
 // Verify that the infobar shows the "Always translate this language" button
 // after doing 3 translations.
 TEST_F(TranslationInfoBarTest, TriggerShowAlwaysTranslateButton) {
-  TranslatePrefs translate_prefs(browser_helper_.profile()->GetPrefs());
+  TranslatePrefs translate_prefs(profile()->GetPrefs());
   translate_prefs.ResetTranslationAcceptedCount("en");
   for (int i = 0; i < 4; ++i) {
     translate_prefs.IncrementTranslationAcceptedCount("en");
@@ -238,7 +236,7 @@ TEST_F(TranslationInfoBarTest, TriggerShowAlwaysTranslateButton) {
 // Verify that the infobar shows the "Never translate this language" button
 // after denying 3 translations.
 TEST_F(TranslationInfoBarTest, TriggerShowNeverTranslateButton) {
-  TranslatePrefs translate_prefs(browser_helper_.profile()->GetPrefs());
+  TranslatePrefs translate_prefs(profile()->GetPrefs());
   translate_prefs.ResetTranslationDeniedCount("en");
   for (int i = 0; i < 4; ++i) {
     translate_prefs.IncrementTranslationDeniedCount("en");
diff --git a/chrome/browser/ui/cocoa/window_size_autosaver_unittest.mm b/chrome/browser/ui/cocoa/window_size_autosaver_unittest.mm
index 70d0b09..fc0decc 100644
--- a/chrome/browser/ui/cocoa/window_size_autosaver_unittest.mm
+++ b/chrome/browser/ui/cocoa/window_size_autosaver_unittest.mm
@@ -9,16 +9,15 @@
 #include "base/memory/scoped_nsobject.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
-#include "chrome/browser/ui/cocoa/browser_test_helper.h"
-#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
+#include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 namespace {
 
-class WindowSizeAutosaverTest : public CocoaTest {
+class WindowSizeAutosaverTest : public CocoaProfileTest {
   virtual void SetUp() {
-    CocoaTest::SetUp();
+    CocoaProfileTest::SetUp();
     path_ = "WindowSizeAutosaverTest";
     window_ =
         [[NSWindow alloc] initWithContentRect:NSMakeRect(100, 101, 150, 151)
@@ -26,24 +25,23 @@ class WindowSizeAutosaverTest : public CocoaTest {
                                               NSResizableWindowMask
                                       backing:NSBackingStoreBuffered
                                         defer:NO];
-    browser_helper_.profile()->GetPrefs()->RegisterDictionaryPref(
+    profile()->GetPrefs()->RegisterDictionaryPref(
         path_,
         PrefService::UNSYNCABLE_PREF);
   }
 
   virtual void TearDown() {
     [window_ close];
-    CocoaTest::TearDown();
+    CocoaProfileTest::TearDown();
   }
 
  public:
-  BrowserTestHelper browser_helper_;
   NSWindow* window_;
   const char* path_;
 };
 
 TEST_F(WindowSizeAutosaverTest, RestoresAndSavesPos) {
-  PrefService* pref = browser_helper_.profile()->GetPrefs();
+  PrefService* pref = profile()->GetPrefs();
   ASSERT_TRUE(pref != NULL);
 
   // Check to make sure there is no existing pref for window placement.
@@ -110,7 +108,7 @@ TEST_F(WindowSizeAutosaverTest, RestoresAndSavesPos) {
 }
 
 TEST_F(WindowSizeAutosaverTest, RestoresAndSavesRect) {
-  PrefService* pref = browser_helper_.profile()->GetPrefs();
+  PrefService* pref = profile()->GetPrefs();
   ASSERT_TRUE(pref != NULL);
 
   // Check to make sure there is no existing pref for window placement.
@@ -172,7 +170,7 @@ TEST_F(WindowSizeAutosaverTest, RestoresAndSavesRect) {
 
 // http://crbug.com/39625
 TEST_F(WindowSizeAutosaverTest, DoesNotRestoreButClearsEmptyRect) {
-  PrefService* pref = browser_helper_.profile()->GetPrefs();
+  PrefService* pref = profile()->GetPrefs();
   ASSERT_TRUE(pref != NULL);
 
   DictionaryPrefUpdate update(pref, path_);
diff --git a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm
index 146b874..84f6998 100644
--- a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm
@@ -4,8 +4,7 @@
 
 #include "base/memory/scoped_nsobject.h"
 #include "chrome/app/chrome_command_ids.h"
-#include "chrome/browser/ui/cocoa/browser_test_helper.h"
-#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
+#include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 #include "chrome/browser/ui/cocoa/run_loop_testing.h"
 #import "chrome/browser/ui/cocoa/view_resizer_pong.h"
@@ -32,16 +31,18 @@ class MockWrenchMenuModel : public WrenchMenuModel {
   MOCK_METHOD1(ExecuteCommand, void(int command_id));
 };
 
-class WrenchMenuControllerTest : public CocoaTest {
+class WrenchMenuControllerTest : public CocoaProfileTest {
  public:
-  void SetUp() {
-    Browser* browser = helper_.browser();
+  virtual void SetUp() {
+    CocoaProfileTest::SetUp();
+    ASSERT_TRUE(browser());
+
     resize_delegate_.reset([[ViewResizerPong alloc] init]);
     toolbar_controller_.reset(
-        [[ToolbarController alloc] initWithModel:browser->toolbar_model()
-                                        commands:browser->command_updater()
-                                         profile:helper_.profile()
-                                         browser:browser
+        [[ToolbarController alloc] initWithModel:browser()->toolbar_model()
+                                        commands:browser()->command_updater()
+                                         profile:profile()
+                                         browser:browser()
                                   resizeDelegate:resize_delegate_.get()]);
     EXPECT_TRUE([toolbar_controller_ view]);
     NSView* parent = [test_window() contentView];
@@ -52,7 +53,6 @@ class WrenchMenuControllerTest : public CocoaTest {
     return [toolbar_controller_ wrenchMenuController];
   }
 
-  BrowserTestHelper helper_;
   scoped_nsobject<ViewResizerPong> resize_delegate_;
   MockWrenchMenuModel fake_model_;
   scoped_nsobject<ToolbarController> toolbar_controller_;
diff --git a/chrome/browser/ui/panels/panel_browser_window_cocoa_unittest.mm b/chrome/browser/ui/panels/panel_browser_window_cocoa_unittest.mm
index 781e6ec..db957ad 100644
--- a/chrome/browser/ui/panels/panel_browser_window_cocoa_unittest.mm
+++ b/chrome/browser/ui/panels/panel_browser_window_cocoa_unittest.mm
@@ -14,9 +14,8 @@
 #include "chrome/app/chrome_command_ids.h"  // IDC_*
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
-#import "chrome/browser/ui/cocoa/browser_test_helper.h"
 #import "chrome/browser/ui/cocoa/browser_window_utils.h"
-#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
+#include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #import "chrome/browser/ui/cocoa/run_loop_testing.h"
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
@@ -31,10 +30,10 @@
 #include "testing/gtest_mac.h"
 
 // Main test class.
-class PanelBrowserWindowCocoaTest : public CocoaTest {
+class PanelBrowserWindowCocoaTest : public CocoaProfileTest {
  public:
   virtual void SetUp() {
-    CocoaTest::SetUp();
+    CocoaProfileTest::SetUp();
     CommandLine::ForCurrentProcess()->AppendSwitch(switches::kEnablePanels);
   }
 
@@ -50,10 +49,10 @@ class PanelBrowserWindowCocoaTest : public CocoaTest {
     Browser* panel_browser = Browser::CreateForApp(Browser::TYPE_PANEL,
                                                    panel_name,
                                                    gfx::Rect(),
-                                                   browser_helper_.profile());
+                                                   profile());
 
     TabContentsWrapper* tab_contents = new TabContentsWrapper(
-        new TestTabContents(browser_helper_.profile(), NULL));
+        new TestTabContents(profile(), NULL));
     panel_browser->AddTab(tab_contents, PageTransition::LINK);
 
     // We just created one new panel.
@@ -111,9 +110,6 @@ class PanelBrowserWindowCocoaTest : public CocoaTest {
     [item setTag:command_id];
     return item;
   }
-
- private:
-  BrowserTestHelper browser_helper_;
 };
 
 TEST_F(PanelBrowserWindowCocoaTest, CreateClose) {
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 87daf4d..fcc1d03 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -111,8 +111,6 @@
         'browser/sync/syncable/syncable_mock.cc',
         'browser/sync/syncable/syncable_mock.h',
         'browser/ui/browser.h',
-        'browser/ui/cocoa/browser_test_helper.cc',
-        'browser/ui/cocoa/browser_test_helper.h',
         'browser/ui/tab_contents/test_tab_contents_wrapper.cc',
         'browser/ui/tab_contents/test_tab_contents_wrapper.h',
         'common/pref_store_observer_mock.cc',
@@ -1584,6 +1582,8 @@
         'browser/ui/cocoa/chrome_browser_window_unittest.mm',
         'browser/ui/cocoa/chrome_event_processing_window_unittest.mm',
         'browser/ui/cocoa/clickhold_button_cell_unittest.mm',
+        'browser/ui/cocoa/cocoa_profile_test.h',
+        'browser/ui/cocoa/cocoa_profile_test.mm',
         'browser/ui/cocoa/cocoa_test_helper.h',
         'browser/ui/cocoa/cocoa_test_helper.mm',
         'browser/ui/cocoa/command_observer_bridge_unittest.mm',