Remove TabContents from TabStripModelObserver::TabReplacedAt.

chrome/browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.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.
 
 #include "chrome/browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.h"
 
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 
 using content::WebContents;
 
-namespace {
-
-// TODO(avi): Remove when TabStripModelObserver sends WebContents.
-content::WebContents* WebContentsOf(TabContents* tab_contents) {
-  return tab_contents ? tab_contents->web_contents() : NULL;
-}
-
-}  // namespace
-
 TabStripModelObserverBridge::TabStripModelObserverBridge(TabStripModel* model,
                                                          id controller)
     : controller_(controller), model_(model) {
   DCHECK(model && controller);
   // Register to be a listener on the model so we can get updates and tell
   // |controller_| about them in the future.
   model_->AddObserver(this);
 }
 
 TabStripModelObserverBridge::~TabStripModelObserverBridge() {
@@ skipping 58 matching lines @@
                                                int index,
                                                TabChangeType change_type) {
   if ([controller_ respondsToSelector:
           @selector(tabChangedWithContents:atIndex:changeType:)]) {
     [controller_ tabChangedWithContents:contents
                                 atIndex:index
                              changeType:change_type];
   }
 }
 
-void TabStripModelObserverBridge::TabReplacedAt(
-    TabStripModel* tab_strip_model,
-    TabContents* old_contents,
-    TabContents* new_contents,
-    int index) {
+void TabStripModelObserverBridge::TabReplacedAt(TabStripModel* tab_strip_model,
+                                                WebContents* old_contents,
+                                                WebContents* new_contents,
+                                                int index) {
   if ([controller_ respondsToSelector:
           @selector(tabReplacedWithContents:previousContents:atIndex:)]) {
-    [controller_ tabReplacedWithContents:WebContentsOf(new_contents)
-                        previousContents:WebContentsOf(old_contents)
+    [controller_ tabReplacedWithContents:new_contents
+                        previousContents:old_contents
                                  atIndex:index];
   } else {
-    TabChangedAt(WebContentsOf(new_contents), index, ALL);
+    TabChangedAt(new_contents, index, ALL);
   }
 }
 
-void TabStripModelObserverBridge::TabMiniStateChanged(
-    WebContents* contents,
-    int index) {
+void TabStripModelObserverBridge::TabMiniStateChanged(WebContents* contents,
+                                                      int index) {
   if ([controller_ respondsToSelector:
           @selector(tabMiniStateChangedWithContents:atIndex:)]) {
     [controller_ tabMiniStateChangedWithContents:contents
                                          atIndex:index];
   }
 }
 
 void TabStripModelObserverBridge::TabStripEmpty() {
   if ([controller_ respondsToSelector:@selector(tabStripEmpty)])
     [controller_ tabStripEmpty];
 }
 
 void TabStripModelObserverBridge::TabStripModelDeleted() {
   if ([controller_ respondsToSelector:@selector(tabStripModelDeleted)])
     [controller_ tabStripModelDeleted];
 }