Remove TabContents from TabStripModelObserver::ActiveTabChanged.

chrome/browser/ui/tabs/tab_strip_model_unittest.cc

 // 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/tabs/tab_strip_model.h"
 
 #include <map>
 #include <string>
 
 #include "base/file_path.h"
@@ skipping 257 matching lines @@
 
   // TabStripModelObserver implementation:
   virtual void TabInsertedAt(WebContents* contents,
                              int index,
                              bool foreground) OVERRIDE {
     empty_ = false;
     State s(contents, index, INSERT);
     s.foreground = foreground;
     states_.push_back(s);
   }
-  virtual void ActiveTabChanged(TabContents* old_contents,
-                                TabContents* new_contents,
+  virtual void ActiveTabChanged(WebContents* old_contents,
+                                WebContents* new_contents,
                                 int index,
                                 bool user_gesture) OVERRIDE {
-    State s(
-        new_contents ? new_contents->web_contents() : NULL, index, ACTIVATE);
-    s.src_contents = old_contents ? old_contents->web_contents() : NULL;
+    State s(new_contents, index, ACTIVATE);
+    s.src_contents = old_contents;
     s.user_gesture = user_gesture;
     states_.push_back(s);
   }
   virtual void TabSelectionChanged(
       TabStripModel* tab_strip_model,
       const TabStripSelectionModel& old_model) OVERRIDE {
     State s(model()->GetActiveWebContents(), model()->active_index(), SELECT);
     s.src_contents = model()->GetWebContentsAt(old_model.active());
     s.src_index = old_model.active();
     states_.push_back(s);
@@ skipping 2114 matching lines @@
   strip.ActivateTabAt(1, true);
   ASSERT_EQ(1, observer.GetStateCount());
   State s(contents2, 1, MockTabStripModelObserver::SELECT);
   s.src_contents = contents2;
   s.src_index = 1;
   s.user_gesture = false;
   EXPECT_TRUE(observer.StateEquals(0, s));
   strip.RemoveObserver(&observer);
   strip.CloseAllTabs();
 }