Infobar system refactor.

chrome/browser/ui/cocoa/infobars/infobar_controller.mm

 // 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 "chrome/browser/ui/cocoa/infobars/infobar_controller.h"
 
 #include "base/logging.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_util.h"
 #include "chrome/browser/infobars/infobar_service.h"
@@ skipping 95 matching lines @@
 
 // Called when someone clicks on the close button.
 - (void)dismiss:(id)sender {
   if (![self isOwned])
     return;
   [self delegate]->InfoBarDismissed();
   [self removeSelf];
 }
 
 - (void)removeSelf {
-  infobar_->RemoveSelfCocoa();
+  infobar_->RemoveSelf();
 }
 
 - (void)addAdditionalControls {
   // Default implementation does nothing.
 }
 
 - (void)infobarWillClose {
 }
 
 - (void)removeButtons {
@@ skipping 44 matching lines @@
   label_.reset([[HyperlinkTextView alloc]
       initWithFrame:[labelPlaceholder_ frame]]);
   [label_.get() setAutoresizingMask:[labelPlaceholder_ autoresizingMask]];
   [[labelPlaceholder_ superview]
       replaceSubview:labelPlaceholder_ with:label_.get()];
   labelPlaceholder_ = nil;  // Now released.
   [label_.get() setDelegate:self];
 }
 
 @end