Fixes up bookmark bubbles and the browser window so that they shut down corre...

chrome/browser/cocoa/cocoa_test_helper.h

 // Copyright (c) 2009 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_COCOA_COCOA_TEST_HELPER_H_
 #define CHROME_BROWSER_COCOA_COCOA_TEST_HELPER_H_
 
 #import <Cocoa/Cocoa.h>
 #include <vector>
 
@@ skipping 87 matching lines @@
   // need to close it at a very specific time; just before we enter our clean
   // up loop in TearDown.
   CocoaTestHelperWindow* test_window_;
 };
 
 // A macro defining a standard set of tests to run on a view. Since we can't
 // inherit tests, this macro saves us a lot of duplicate code. Handles simply
 // displaying the view to make sure it won't crash, as well as removing it
 // from a window. All tests that work with NSView subclasses and/or
 // NSViewController subclasses should use it.
-#define TEST_VIEW(test_fixture, view_member_name) \
+#define TEST_VIEW(test_fixture, test_view) \
   TEST_F(test_fixture, AddRemove##test_fixture) { \
-    scoped_nsobject<NSView> view([view_member_name retain]); \
-    EXPECT_EQ([test_window() contentView], [view_member_name superview]); \
-    [view_member_name removeFromSuperview]; \
-    EXPECT_FALSE([view_member_name superview]); \
+    scoped_nsobject<NSView> view([test_view retain]); \
+    EXPECT_EQ([test_window() contentView], [view superview]); \
+    [view removeFromSuperview]; \
+    EXPECT_FALSE([view superview]); \
   } \
   TEST_F(test_fixture, Display##test_fixture) { \
-    [view_member_name display]; \
+    [test_view display]; \
   }
 
 // The classes below are deprecated and will be removed shortly. Do not write
 // any tests based on them.
 
 // A class that initializes Cocoa and sets up resources for many of our
 // Cocoa controller unit tests. It does several key things:
 //   - Creates and displays an empty Cocoa window for views to live in
 //   - Loads the appropriate bundle so nib loading works. When loading the
 //     nib in the class being tested, your must use |mac_util::MainAppBundle()|
@@ skipping 55 matching lines @@
   void clearFirstResponder() {
     [window_ setPretendIsKeyWindow:NO];
     [window_ makeFirstResponder:nil];
   }
 
  private:
   scoped_nsobject<CocoaTestHelperWindow> window_;
 };
 
 #endif  // CHROME_BROWSER_COCOA_COCOA_TEST_HELPER_H_