Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(407)

Unified Diff: chrome/browser/ui/cocoa/toolbar/toolbar_controller_unittest.mm

Issue 10692195: Consolidate Browser Creation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/toolbar/toolbar_controller_unittest.mm
===================================================================
--- chrome/browser/ui/cocoa/toolbar/toolbar_controller_unittest.mm (revision 148382)
+++ chrome/browser/ui/cocoa/toolbar/toolbar_controller_unittest.mm (working copy)
@@ -49,7 +49,7 @@
kWrenchIndex, kLocationIndex, kBrowserActionContainerViewIndex
};
- virtual void SetUp() {
+ virtual void SetUp() OVERRIDE {
CocoaProfileTest::SetUp();
ASSERT_TRUE(browser());
@@ -71,6 +71,11 @@
[parent addSubview:[bar_ view]];
}
+ virtual void TearDown() OVERRIDE {
+ bar_.reset(); // browser() must outlive the ToolbarController.
+ CocoaProfileTest::TearDown();
+ }
+
// Make sure the enabled state of the view is the same as the corresponding
// command in the updater. The views are in the declaration order of outlets.
void CompareState(CommandUpdater* updater, NSArray* views) {
« no previous file with comments | « chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm ('k') | chrome/browser/ui/extensions/application_launch.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698