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

chrome/browser/automation/automation_provider_observers.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/automation/automation_provider_observers.h"
 
 #include <deque>
 #include <string>
 #include <vector>
 
@@ skipping 58 matching lines @@
 #include "chrome/browser/ui/webui/ntp/most_visited_handler.h"
 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
 #include "chrome/browser/ui/webui/ntp/recently_closed_tabs_handler.h"
 #include "chrome/common/automation_messages.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_view_type.h"
 #include "chrome/common/content_settings_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/browser/download/save_package.h"
 #include "content/browser/renderer_host/render_view_host.h"
-#include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
+#include "content/public/browser/web_contents.h"
 #include "content/public/common/process_type.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/rect.h"
 
 using content::BrowserThread;
 using content::DownloadItem;
 using content::DownloadManager;
 using content::NavigationController;
@@ skipping 294 matching lines @@
 TabStripNotificationObserver::~TabStripNotificationObserver() {
 }
 
 void TabStripNotificationObserver::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   if (type == notification_) {
     if (type == content::NOTIFICATION_TAB_PARENTED) {
       ObserveTab(&(content::Source<TabContentsWrapper>(source).ptr()->
-                     tab_contents()->GetController()));
+                     web_contents()->GetController()));
     } else {
       ObserveTab(content::Source<NavigationController>(source).ptr());
     }
     delete this;
   } else {
     NOTREACHED();
   }
 }
 
 TabAppendedNotificationObserver::TabAppendedNotificationObserver(
@@ skipping 2260 matching lines @@
                  content::NotificationService::AllSources());
   for (BrowserList::const_iterator iter = BrowserList::begin();
        iter != BrowserList::end();
        ++iter) {
     Browser* browser = *iter;
     for (int i = 0; i < browser->tab_count(); ++i) {
       TabContentsWrapper* contents_wrapper =
           browser->GetTabContentsWrapperAt(i);
       StartObserving(contents_wrapper->automation_tab_helper());
       if (contents_wrapper->automation_tab_helper()->has_pending_loads())
-        pending_tabs_.insert(contents_wrapper->tab_contents());
+        pending_tabs_.insert(contents_wrapper->web_contents());
     }
   }
   CheckIfNoMorePendingLoads();
 }
 
 AllViewsStoppedLoadingObserver::~AllViewsStoppedLoadingObserver() {
 }
 
 void AllViewsStoppedLoadingObserver::OnFirstPendingLoad(
     content::WebContents* web_contents) {
@@ skipping 57 matching lines @@
                  content::NOTIFICATION_TAB_PARENTED,
                  content::NotificationService::AllSources());
 }
 
 void NewTabObserver::Observe(int type,
                              const content::NotificationSource& source,
                              const content::NotificationDetails& details) {
   DCHECK_EQ(content::NOTIFICATION_TAB_PARENTED, type);
   NavigationController* controller =
       &(content::Source<TabContentsWrapper>(source).ptr()->
-          tab_contents()->GetController());
+          web_contents()->GetController());
   if (automation_) {
     // TODO(phajdan.jr): Clean up this hack. We write the correct return type
     // here, but don't send the message. NavigationNotificationObserver
     // will wait properly for the load to finish, and send the message,
     // but it will also append its own return value at the end of the reply.
     AutomationMsg_WindowExecuteCommand::WriteReplyParams(reply_message_.get(),
                                                          true);
     new NavigationNotificationObserver(controller, automation_,
                                        reply_message_.release(),
                                        1, false, false);
@@ skipping 332 matching lines @@
   }
 
   ExtensionHost* host = content::Details<ExtensionHost>(details).ptr();
   if (host->extension_id() == extension_id_ &&
       host->extension_host_type() == chrome::VIEW_TYPE_EXTENSION_POPUP) {
     AutomationJSONReply(automation_, reply_message_.release())
         .SendSuccess(NULL);
     delete this;
   }
 }