Fix memory problems.

Remove some dead code.
Remove valgrind suppression which suppressed this error.

BUG=http://crbug.com/26489
TEST=Mac valgrind bot stays green for ui_test BrowserEncodingTest.TestEncodingAliasMapping

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

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

1 files changed, 6 insertions, 6 deletions

diff --git a/chrome/browser/cocoa/bookmark_bar_controller.mm b/chrome/browser/cocoa/bookmark_bar_controller.mm
index bdbe4ad..7100bbb 100644
--- a/chrome/browser/cocoa/bookmark_bar_controller.mm
+++ b/chrome/browser/cocoa/bookmark_bar_controller.mm
@@ -139,9 +139,11 @@
 // Position the off-the-side chevron to the left of the otherBookmarks button.
 - (void)positionOffTheSideButton {
   NSRect frame = [offTheSideButton_ frame];
-  frame.origin.x = ([otherBookmarksButton_ frame].origin.x -
-                    (frame.size.width + bookmarks::kBookmarkHorizontalPadding));
-  [offTheSideButton_ setFrame:frame];
+  if (otherBookmarksButton_.get()) {
+    frame.origin.x = ([otherBookmarksButton_ frame].origin.x -
+                      (frame.size.width + bookmarks::kBookmarkHorizontalPadding));
+    [offTheSideButton_ setFrame:frame];
+  }
 }
 
 // Check if we should enable or disable the off-the-side chevron.
@@ -804,9 +806,7 @@
   [buttonView_ addSubview:button];
 
   // Now that it's here, move the chevron over.
-  NSRect oframe = [offTheSideButton_ frame];
-  oframe.origin.x = frame.origin.x - (oframe.size.width +
-                                      bookmarks::kBookmarkHorizontalPadding);
+  [self positionOffTheSideButton];
 
   // Force it to be the right size, right now.
   [self resizeButtons];