Remove TabContents from TabStripModelObserverBridge.

chrome/browser/ui/cocoa/browser_window_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/browser_window_controller.h"
 
 #include <cmath>
 #include <numeric>
 
 #include "base/command_line.h"
@@ skipping 1533 matching lines @@
   [devToolsController_ updateDevToolsForWebContents:contents
                                         withProfile:browser_->profile()];
 
   // Update the bookmark bar.
   // Must do it after devtools updates, otherwise bookmark bar might
   // call resizeView -> layoutSubviews and cause unnecessary relayout.
   // TODO(viettrungluu): perhaps update to not terminate running animations (if
   // applicable)?
   [self updateBookmarkBarVisibilityWithAnimation:NO];
 
-  TabContents* tabContents = TabContents::FromWebContents(contents);
-  // Without the .get(), xcode fails.
-  [infoBarContainerController_.get() changeTabContents:tabContents];
+  [infoBarContainerController_ changeWebContents:contents];
 }
 
 - (void)onReplaceTabWithContents:(WebContents*)contents {
   // Simply remove the preview view if it exists; the tab strip
   // controller will reinstall the view as the active view.
   [previewableContentsController_ hidePreview];
   [self updateBookmarkBarVisibilityWithAnimation:NO];
 }
 
 - (void)onTabChanged:(TabStripModelObserver::TabChangeType)change
         withContents:(WebContents*)contents {
   // Update titles if this is the currently selected tab and if it isn't just
   // the loading state which changed.
   if (change != TabStripModelObserver::LOADING_ONLY)
     windowShim_->UpdateTitleBar();
 
   // Update the bookmark bar if this is the currently selected tab and if it
   // isn't just the title which changed. This for transitions between the NTP
   // (showing its floating bookmark bar) and normal web pages (showing no
   // bookmark bar).
   // TODO(viettrungluu): perhaps update to not terminate running animations?
   if (change != TabStripModelObserver::TITLE_NOT_LOADING)
     [self updateBookmarkBarVisibilityWithAnimation:NO];
 }
 
 - (void)onTabDetachedWithContents:(WebContents*)contents {
-  TabContents* tabContents = TabContents::FromWebContents(contents);
-  [infoBarContainerController_ tabDetachedWithContents:tabContents];
+  [infoBarContainerController_ tabDetachedWithContents:contents];
 }
 
 - (void)onInsertTabWithContents:(WebContents*)contents {
   [previewableContentsController_ onInsertTabWithContents:contents];
 }
 
 - (void)userChangedTheme {
   // TODO(dmaclach): Instead of redrawing the whole window, views that care
   // about the active window state should be registering for notifications.
   [[self window] setViewsNeedDisplay:YES];
@@ skipping 596 matching lines @@
 
 - (BOOL)supportsBookmarkBar {
   return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
 }
 
 - (BOOL)isTabbedWindow {
   return browser_->is_type_tabbed();
 }
 
 @end  // @implementation BrowserWindowController(WindowType)