Get rid of a bunch of tab_contents.h includes from chrome. These are all trivial changes to use W...

chrome/browser/instant/instant_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/instant/instant_controller.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/rand_util.h"
 #include "build/build_config.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/instant/instant_delegate.h"
 #include "chrome/browser/instant/instant_field_trial.h"
 #include "chrome/browser/instant/instant_loader.h"
 #include "chrome/browser/instant/promo_counter.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
-#include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/notification_service.h"
+#include "content/public/browser/web_contents.h"
 
 #if defined(TOOLKIT_VIEWS)
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #endif
 
 InstantController::InstantController(Profile* profile,
                                      InstantDelegate* delegate)
     : delegate_(delegate),
@@ skipping 220 matching lines @@
   string16 suggested_text;
   UpdateLoader(template_url, last_url_, last_transition_type_, last_user_text_,
                true, &suggested_text);
   return true;
 }
 
 TabContentsWrapper* InstantController::CommitCurrentPreview(
     InstantCommitType type) {
   DCHECK(loader_.get());
   TabContentsWrapper* tab = ReleasePreviewContents(type);
-  tab->tab_contents()->GetController().CopyStateFromAndPrune(
-      &tab_contents_->tab_contents()->GetController());
+  tab->web_contents()->GetController().CopyStateFromAndPrune(
+      &tab_contents_->web_contents()->GetController());
   delegate_->CommitInstant(tab);
   CompleteRelease(tab);
   return tab;
 }
 
 void InstantController::SetCommitOnMouseUp() {
   commit_on_mouse_up_ = true;
 }
 
 bool InstantController::IsMouseDownFromActivate() {
@@ skipping 14 matching lines @@
 }
 #else
 void InstantController::OnAutocompleteLostFocus(
     gfx::NativeView view_gaining_focus) {
   if (!IsCurrent()) {
     DestroyPreviewContents();
     return;
   }
 
   RenderWidgetHostView* rwhv =
-      GetPreviewContents()->tab_contents()->GetRenderWidgetHostView();
+      GetPreviewContents()->web_contents()->GetRenderWidgetHostView();
   if (!view_gaining_focus || !rwhv) {
     DestroyPreviewContents();
     return;
   }
 
 #if defined(TOOLKIT_VIEWS)
   // For views the top level widget is always focused. If the focus change
   // originated in views determine the child Widget from the view that is being
   // focused.
   if (view_gaining_focus) {
     views::Widget* widget =
         views::Widget::GetWidgetForNativeView(view_gaining_focus);
     if (widget) {
       views::FocusManager* focus_manager = widget->GetFocusManager();
       if (focus_manager && focus_manager->is_changing_focus() &&
           focus_manager->GetFocusedView() &&
           focus_manager->GetFocusedView()->GetWidget()) {
         view_gaining_focus =
             focus_manager->GetFocusedView()->GetWidget()->GetNativeView();
       }
     }
   }
 #endif
 
   gfx::NativeView tab_view =
-      GetPreviewContents()->tab_contents()->GetNativeView();
+      GetPreviewContents()->web_contents()->GetNativeView();
   // Focus is going to the renderer.
   if (rwhv->GetNativeView() == view_gaining_focus ||
       tab_view == view_gaining_focus) {
     if (!IsMouseDownFromActivate()) {
       // If the mouse is not down, focus is not going to the renderer. Someone
       // else moved focus and we shouldn't commit.
       DestroyPreviewContents();
       return;
     }
 
@@ skipping 210 matching lines @@
   if (!weak_factory_.HasWeakPtrs()) {
     MessageLoop::current()->PostTask(
         FROM_HERE, base::Bind(&InstantController::DestroyLoaders,
                               weak_factory_.GetWeakPtr()));
   }
 }
 
 void InstantController::DestroyLoaders() {
   loaders_to_destroy_.reset();
 }