Remove TabContents from TabStripModelObserver::TabReplacedAt.

chrome/browser/extensions/api/web_navigation/web_navigation_api.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.
 
 // Implements the Chrome Extensions WebNavigation API.
 
 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h"
 
 #include "base/lazy_instance.h"
 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api_constants.h"
@@ skipping 92 matching lines @@
 }
 
 void WebNavigationEventRouter::OnBrowserRemoved(Browser* browser) {
   if (!profile_->IsSameProfile(browser->profile()))
     return;
   browser->tab_strip_model()->RemoveObserver(this);
 }
 
 void WebNavigationEventRouter::TabReplacedAt(
     TabStripModel* tab_strip_model,
-    TabContents* old_contents,
-    TabContents* new_contents,
+    content::WebContents* old_contents,
+    content::WebContents* new_contents,
     int index) {
   WebNavigationTabObserver* tab_observer =
-      WebNavigationTabObserver::Get(old_contents->web_contents());
+      WebNavigationTabObserver::Get(old_contents);
   if (!tab_observer) {
     // If you hit this DCHECK(), please add reproduction steps to
     // http://crbug.com/109464.
-    DCHECK(chrome::GetViewType(old_contents->web_contents()) !=
-           chrome::VIEW_TYPE_TAB_CONTENTS);
+    DCHECK(chrome::GetViewType(old_contents) != chrome::VIEW_TYPE_TAB_CONTENTS);
     return;
   }
   const FrameNavigationState& frame_navigation_state =
       tab_observer->frame_navigation_state();
 
-  if (!frame_navigation_state.IsValidUrl(
-          old_contents->web_contents()->GetURL()) ||
-      !frame_navigation_state.IsValidUrl(
-          new_contents->web_contents()->GetURL()))
+  if (!frame_navigation_state.IsValidUrl(old_contents->GetURL()) ||
+      !frame_navigation_state.IsValidUrl(new_contents->GetURL()))
     return;
 
-  helpers::DispatchOnTabReplaced(
-      old_contents->web_contents(),
-      profile_,
-      new_contents->web_contents());
+  helpers::DispatchOnTabReplaced(old_contents, profile_, new_contents);
 }
 
 void WebNavigationEventRouter::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_RETARGETING: {
       Profile* profile = content::Source<Profile>(source).ptr();
       if (profile->GetOriginalProfile() == profile_) {
@@ skipping 588 matching lines @@
         parent_frame_id.frame_num);
     frame->process_id = frame_id.render_view_host->GetProcess()->GetID();
     frame->error_occurred = navigation_state.GetErrorOccurredInFrame(frame_id);
     result_list.push_back(frame);
   }
   results_ = GetAllFrames::Results::Create(result_list);
   return true;
 }
 
 }  // namespace extensions