Move most of the remaining users of WebContentsObserver::tab_contents() to use web_contents().

chrome/browser/ui/find_bar/find_bar_controller.cc

 // Copyright (c) 2011 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/find_bar/find_bar_controller.h"
 
 #include <algorithm>
 
 #include "base/i18n/rtl.h"
 #include "build/build_config.h"
 #include "chrome/browser/ui/find_bar/find_bar.h"
 #include "chrome/browser/ui/find_bar/find_bar_state.h"
 #include "chrome/browser/ui/find_bar/find_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "ui/gfx/rect.h"
 
+using content::WebContents;
+
 // The minimum space between the FindInPage window and the search result.
 static const int kMinFindWndDistanceFromSelection = 5;
 
 FindBarController::FindBarController(FindBar* find_bar)
     : find_bar_(find_bar),
       tab_contents_(NULL),
       last_reported_matchcount_(0) {
 }
 
 FindBarController::~FindBarController() {
@@ skipping 48 matching lines @@
   if (find_bar_->IsFindBarVisible() &&
       (!tab_contents_ || !tab_contents_->find_tab_helper()->find_ui_active())) {
     find_bar_->Hide(false);
   }
 
   if (!tab_contents_)
     return;
 
   registrar_.Add(this,
                  chrome::NOTIFICATION_FIND_RESULT_AVAILABLE,
-                 content::Source<TabContents>(tab_contents_->tab_contents()));
+                 content::Source<WebContents>(tab_contents_->tab_contents()));
   registrar_.Add(
       this,
       content::NOTIFICATION_NAV_ENTRY_COMMITTED,
       content::Source<NavigationController>(
           &tab_contents_->tab_contents()->GetController()));
 
   MaybeSetPrepopulateText();
 
   if (tab_contents_->find_tab_helper()->find_ui_active()) {
     // A tab with a visible find bar just got selected and we need to show the
@@ skipping 10 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // FindBarHost, content::NotificationObserver implementation:
 
 void FindBarController::Observe(int type,
                                 const content::NotificationSource& source,
                                 const content::NotificationDetails& details) {
   FindTabHelper* find_tab_helper = tab_contents_->find_tab_helper();
   if (type == chrome::NOTIFICATION_FIND_RESULT_AVAILABLE) {
     // Don't update for notifications from TabContentses other than the one we
     // are actively tracking.
-    if (content::Source<TabContents>(source).ptr() ==
+    if (content::Source<WebContents>(source).ptr() ==
         tab_contents_->tab_contents()) {
       UpdateFindBarForCurrentResult();
       if (find_tab_helper->find_result().final_update() &&
           find_tab_helper->find_result().number_of_matches() == 0) {
         const string16& last_search = find_tab_helper->previous_find_text();
         const string16& current_search = find_tab_helper->find_text();
         if (last_search.find(current_search) != 0)
           find_bar_->AudibleAlert();
       }
     }
@@ skipping 102 matching lines @@
   // shown it is showing the right state for this tab. We update the find text
   // _first_ since the FindBarView checks its emptiness to see if it should
   // clear the result count display when there's nothing in the box.
   find_bar_->SetFindText(find_string);
 #else
   // Having a per-tab find_string is not compatible with OS X's find pasteboard,
   // so we always have the same find text in all find bars. This is done through
   // the find pasteboard mechanism, so don't set the text here.
 #endif
 }