Consolidate Browser Creation.

chrome/browser/ui/cocoa/cocoa_profile_test.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_COCOA_PROFILE_TEST_H_
 #define CHROME_BROWSER_UI_COCOA_PROFILE_TEST_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 29 matching lines @@
   virtual void SetUp() OVERRIDE;
 
   virtual void TearDown() OVERRIDE;
 
   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 will automatically be called as
+  // part of TearDown() if it's not been done already.
+  void CloseBrowserWindow();
 
-  // Closes the window for this browser. This must only be called after
-  // CreateBrowserWindow(). This will automatically be called as part of
-  // TearDown() if it's not been done already.
-  void CloseBrowserWindow();
+ protected:
+  // Overridden by test subclasses to create their own browser, e.g. with a
+  // test window.
+  virtual Browser* CreateBrowser();
 
  private:
   MessageLoopForUI message_loop_;
   content::TestBrowserThread ui_thread_;
 
   TestingProfileManager profile_manager_;
   TestingProfile* profile_;  // Weak; owned by profile_manager_.
   scoped_ptr<Browser> browser_;
 
   scoped_ptr<content::TestBrowserThread> file_user_blocking_thread_;
   scoped_ptr<content::TestBrowserThread> file_thread_;
   scoped_ptr<content::TestBrowserThread> io_thread_;
 };
 
 #endif  // CHROME_BROWSER_UI_COCOA_PROFILE_TEST_H_