Fix race condition if a pulsing bookmark button is deleted while the bookmark bubble controller is …

chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/memory/scoped_ptr.h"
 #import "chrome/browser/ui/cocoa/base_bubble_controller.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h"
 
 class BookmarkModel;
 class BookmarkNode;
 @class BookmarkBubbleController;
 
 // Controller for the bookmark bubble.  The bookmark bubble is a
 // bubble that pops up when clicking on the STAR next to the URL to
 // add or remove it as a bookmark.  This bubble allows for editing of
 // the bookmark in various ways (name, folder, etc.)
 @interface BookmarkBubbleController : BaseBubbleController {
  @private
-  // Both weak; owned by the current browser's profile
+  // Both weak; owned by the current browser's profile.
   BookmarkModel* model_;  // weak
   const BookmarkNode* node_;  // weak
 
   // The bookmark node whose button we asked to pulse.
   const BookmarkNode* pulsingBookmarkNode_;  // weak
 
   BOOL alreadyBookmarked_;
 
   // Ping me when the bookmark model changes out from under us.
-  scoped_ptr<BookmarkModelObserverForCocoa> bookmark_observer_;
+  scoped_ptr<BookmarkModelObserverForCocoa> bookmarkObserver_;
 
   IBOutlet NSTextField* bigTitle_;   // "Bookmark" or "Bookmark Added!"
   IBOutlet NSTextField* nameTextField_;
   IBOutlet NSPopUpButton* folderPopUpButton_;
 }
 
 @property(readonly, nonatomic) const BookmarkNode* node;
 
 // |node| is the bookmark node we edit in this bubble.
 // |alreadyBookmarked| tells us if the node was bookmarked before the
@@ skipping 21 matching lines @@
 // Exposed only for unit testing.
 @interface BookmarkBubbleController (ExposedForUnitTesting)
 - (void)addFolderNodes:(const BookmarkNode*)parent
          toPopUpButton:(NSPopUpButton*)button
            indentation:(int)indentation;
 - (void)setTitle:(NSString*)title parentFolder:(const BookmarkNode*)parent;
 - (void)setParentFolderSelection:(const BookmarkNode*)parent;
 + (NSString*)chooseAnotherFolderString;
 - (NSPopUpButton*)folderPopUpButton;
 @end