TabContents -> WebContentsImpl, part 18.

TabContents -> WebContents in chrome/, part 2.

BUG=105875
TEST=no change

Review URL: https://chromiumcodereview.appspot.com/10107002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132568 0039d316-1c4b-4281-b951-d872f2087c98

47 files changed, 113 insertions, 118 deletions

diff --git a/chrome/browser/aeropeek_manager.cc b/chrome/browser/aeropeek_manager.cc
index 171cdb1..ccdf178 100644
--- a/chrome/browser/aeropeek_manager.cc
+++ b/chrome/browser/aeropeek_manager.cc
@@ -434,9 +434,9 @@ class AeroPeekWindow : public ui::WindowImpl {
   // An interface which dispatches events received from Window.
   // This window notifies events received from Windows to TabStrip through
   // this interface.
-  // We should not directly access TabContents members since Windows may send
+  // We should not directly access WebContents members since Windows may send
   // AeroPeek events to a tab closed by Chrome.
-  // To prevent such race condition, we get access to TabContents through
+  // To prevent such race condition, we get access to WebContents through
   // AeroPeekManager.
   AeroPeekWindowDelegate* delegate_;
 
diff --git a/chrome/browser/aeropeek_manager.h b/chrome/browser/aeropeek_manager.h
index 26ae054..2f2b1c23 100644
--- a/chrome/browser/aeropeek_manager.h
+++ b/chrome/browser/aeropeek_manager.h
@@ -168,8 +168,8 @@ class AeroPeekManager : public TabStripModelObserver,
   // if it is alive.
   // Since Windows cannot send AeroPeek events directly to Chrome windows, we
   // use a place-holder window to receive AeroPeek events. So, when Windows
-  // sends an AeroPeek event, the corresponding tab (and TabContents) may have
-  // been deleted by Chrome. To prevent us from accessing deleted TabContents,
+  // sends an AeroPeek event, the corresponding tab (and WebContents) may have
+  // been deleted by Chrome. To prevent us from accessing deleted WebContents,
   // we need to check if the tab is still alive.
   content::WebContents* GetWebContents(int tab_id) const;
 
diff --git a/chrome/browser/alternate_nav_url_fetcher.cc b/chrome/browser/alternate_nav_url_fetcher.cc
index 8e3d997..ddb51ce 100644
--- a/chrome/browser/alternate_nav_url_fetcher.cc
+++ b/chrome/browser/alternate_nav_url_fetcher.cc
@@ -92,7 +92,7 @@ bool AlternateNavInfoBarDelegate::LinkClicked(
   owner()->web_contents()->OpenURL(params);
 
   // We should always close, even if the navigation did not occur within this
-  // TabContents.
+  // WebContents.
   return true;
 }
 
diff --git a/chrome/browser/autofill/autofill_manager_unittest.cc b/chrome/browser/autofill/autofill_manager_unittest.cc
index f265402..bfef7ff 100644
--- a/chrome/browser/autofill/autofill_manager_unittest.cc
+++ b/chrome/browser/autofill/autofill_manager_unittest.cc
@@ -2980,7 +2980,7 @@ TEST_F(AutofillManagerTest, TestExternalDelegate) {
 // landing autofill_external_delegate_android.cc in the Chromium tree
 // have not themselves landed.
 
-// Turn on the external delegate.  Recreate a TabContents.  Make sure
+// Turn on the external delegate.  Recreate a WebContents.  Make sure
 // an external delegate was set in the proper structures.
 TEST_F(AutofillManagerTest, TestTabContentsWithExternalDelegate) {
   CommandLine::ForCurrentProcess()->AppendSwitch(
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
index da88114..c5a5ba7 100644
--- a/chrome/browser/automation/testing_automation_provider.cc
+++ b/chrome/browser/automation/testing_automation_provider.cc
@@ -1531,7 +1531,7 @@ void TestingAutomationProvider::GetPageType(
     *page_type = entry->GetPageType();
     *success = true;
     // In order to return the proper result when an interstitial is shown and
-    // no navigation entry were created for it we need to ask the TabContents.
+    // no navigation entry were created for it we need to ask the WebContents.
     if (*page_type == content::PAGE_TYPE_NORMAL &&
         tab->GetWebContents()->ShowingInterstitialPage())
       *page_type = content::PAGE_TYPE_INTERSTITIAL;
@@ -4072,7 +4072,7 @@ TabContentsWrapper* GetTabContentsWrapperFromDict(const Browser* browser,
   return tab_contents;
 }
 
-// Get the TranslateInfoBarDelegate from TabContents.
+// Get the TranslateInfoBarDelegate from WebContents.
 TranslateInfoBarDelegate* GetTranslateInfoBarDelegate(
     WebContents* web_contents) {
   InfoBarTabHelper* infobar_helper =
diff --git a/chrome/browser/chromeos/login/webui_login_view.h b/chrome/browser/chromeos/login/webui_login_view.h
index c17f6e5..9745f3b 100644
--- a/chrome/browser/chromeos/login/webui_login_view.h
+++ b/chrome/browser/chromeos/login/webui_login_view.h
@@ -119,13 +119,13 @@ class WebUILoginView : public views::WidgetDelegateView,
   // Login window which shows the view.
   views::Widget* login_window_;
 
-  // Converts keyboard events on the TabContents to accelerators.
+  // Converts keyboard events on the WebContents to accelerators.
   UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_;
 
   // Maps installed accelerators to OOBE webui accelerator identifiers.
   AccelMap accel_map_;
 
-  // Watches webui_login_'s TabContents rendering.
+  // Watches webui_login_'s WebContents rendering.
   scoped_ptr<TabRenderWatcher> tab_watcher_;
 
   // Whether the host window is frozen.
diff --git a/chrome/browser/debugger/devtools_window.cc b/chrome/browser/debugger/devtools_window.cc
index 30c8457..c69a635 100644
--- a/chrome/browser/debugger/devtools_window.cc
+++ b/chrome/browser/debugger/devtools_window.cc
@@ -171,7 +171,7 @@ DevToolsWindow* DevToolsWindow::Create(
     RenderViewHost* inspected_rvh,
     bool docked,
     bool shared_worker_frontend) {
-  // Create TabContents with devtools.
+  // Create TabContentsWrapper with devtools.
   TabContentsWrapper* tab_contents =
       Browser::TabContentsFactory(profile, NULL, MSG_ROUTING_NONE, NULL, NULL);
   tab_contents->web_contents()->GetRenderViewHost()->AllowBindings(
diff --git a/chrome/browser/download/download_request_limiter.cc b/chrome/browser/download/download_request_limiter.cc
index 631d89d..91bb6cb 100644
--- a/chrome/browser/download/download_request_limiter.cc
+++ b/chrome/browser/download/download_request_limiter.cc
@@ -153,7 +153,7 @@ void DownloadRequestLimiter::TabDownloadState::Observe(
 
     case content::NOTIFICATION_WEB_CONTENTS_DESTROYED:
       // Tab closed, no need to handle closing the dialog as it's owned by the
-      // TabContents, break so that we get deleted after switch.
+      // WebContents, break so that we get deleted after switch.
       break;
 
     default:
diff --git a/chrome/browser/extensions/api/extension_action/extension_page_actions_api.cc b/chrome/browser/extensions/api/extension_action/extension_page_actions_api.cc
index 7b8a9e7..2db3140 100644
--- a/chrome/browser/extensions/api/extension_action/extension_page_actions_api.cc
+++ b/chrome/browser/extensions/api/extension_action/extension_page_actions_api.cc
@@ -55,7 +55,7 @@ bool PageActionFunction::RunImpl() {
     return false;
   }
 
-  // Find the TabContents that contains this tab id.
+  // Find the TabContentsWrapper that contains this tab id.
   contents_ = NULL;
   TabContentsWrapper* wrapper = NULL;
   bool result = ExtensionTabUtil::GetTabById(
@@ -108,7 +108,7 @@ bool PageActionsFunction::SetPageActionEnabled(bool enable) {
     return false;
   }
 
-  // Find the TabContents that contains this tab id.
+  // Find the TabContentsWrapper that contains this tab id.
   TabContentsWrapper* contents = NULL;
   bool result = ExtensionTabUtil::GetTabById(
       tab_id, profile(), include_incognito(), NULL, NULL, &contents, NULL);
diff --git a/chrome/browser/extensions/extension_browser_event_router.cc b/chrome/browser/extensions/extension_browser_event_router.cc
index 2bf48f7..3346a9e 100644
--- a/chrome/browser/extensions/extension_browser_event_router.cc
+++ b/chrome/browser/extensions/extension_browser_event_router.cc
@@ -153,10 +153,10 @@ void ExtensionBrowserEventRouter::RegisterForTabNotifications(
       this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
       content::Source<NavigationController>(&contents->GetController()));
 
-  // Observing TAB_CONTENTS_DESTROYED is necessary because it's
+  // Observing NOTIFICATION_WEB_CONTENTS_DESTROYED is necessary because it's
   // possible for tabs to be created, detached and then destroyed without
   // ever having been re-attached and closed. This happens in the case of
-  // a devtools TabContents that is opened in window, docked, then closed.
+  // a devtools WebContents that is opened in window, docked, then closed.
   registrar_.Add(this, content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
                  content::Source<WebContents>(contents));
 }
diff --git a/chrome/browser/extensions/extension_browser_event_router.h b/chrome/browser/extensions/extension_browser_event_router.h
index a784eaf..f68592e 100644
--- a/chrome/browser/extensions/extension_browser_event_router.h
+++ b/chrome/browser/extensions/extension_browser_event_router.h
@@ -200,7 +200,7 @@ class ExtensionBrowserEventRouter : public TabStripModelObserver,
 
    private:
     // Whether we are waiting to fire the 'complete' status change. This will
-    // occur the first time the TabContents stops loading after the
+    // occur the first time the WebContents stops loading after the
     // NAV_ENTRY_COMMITTED was fired. The tab may go back into and out of the
     // loading state subsequently, but we will ignore those changes.
     bool complete_waiting_on_load_;
diff --git a/chrome/browser/extensions/extension_browsertests_misc.cc b/chrome/browser/extensions/extension_browsertests_misc.cc
index f364213..154f3e4 100644
--- a/chrome/browser/extensions/extension_browsertests_misc.cc
+++ b/chrome/browser/extensions/extension_browsertests_misc.cc
@@ -86,7 +86,7 @@ static ExtensionHost* FindHostWithPath(ExtensionProcessManager* manager,
 
 // Tests that we can load extension pages into the tab area and they can call
 // extension APIs.
-IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, TabContents) {
+IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, WebContents) {
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("good").AppendASCII("Extensions")
                     .AppendASCII("behllobkkfkfnphdnhnkndlbkcpglgmj")
diff --git a/chrome/browser/extensions/extension_debugger_api.cc b/chrome/browser/extensions/extension_debugger_api.cc
index 80bc2ab..a2bbc09 100644
--- a/chrome/browser/extensions/extension_debugger_api.cc
+++ b/chrome/browser/extensions/extension_debugger_api.cc
@@ -364,7 +364,7 @@ bool DebuggerFunction::InitTabContents() {
   DictionaryValue* dict = static_cast<DictionaryValue*>(debuggee);
   EXTENSION_FUNCTION_VALIDATE(dict->GetInteger(keys::kTabIdKey, &tab_id_));
 
-  // Find the TabContents that contains this tab id.
+  // Find the TabContentsWrapper that contains this tab id.
   contents_ = NULL;
   TabContentsWrapper* wrapper = NULL;
   bool result = ExtensionTabUtil::GetTabById(
diff --git a/chrome/browser/extensions/extension_function_dispatcher.h b/chrome/browser/extensions/extension_function_dispatcher.h
index 67c7656..9829107 100644
--- a/chrome/browser/extensions/extension_function_dispatcher.h
+++ b/chrome/browser/extensions/extension_function_dispatcher.h
@@ -45,7 +45,7 @@ typedef ExtensionFunction* (*ExtensionFunctionFactory)();
 //
 // Note that a single ExtensionFunctionDispatcher does *not* correspond to a
 // single RVH, a single extension, or a single URL. This is by design so that
-// we can gracefully handle cases like TabContents, where the RVH, extension,
+// we can gracefully handle cases like WebContents, where the RVH, extension,
 // and URL can all change over the lifetime of the tab. Instead, these items
 // are all passed into each request.
 class ExtensionFunctionDispatcher
diff --git a/chrome/browser/extensions/extension_host_mac.h b/chrome/browser/extensions/extension_host_mac.h
index 926e07f..5b0e5e0 100644
--- a/chrome/browser/extensions/extension_host_mac.h
+++ b/chrome/browser/extensions/extension_host_mac.h
@@ -9,7 +9,7 @@
 #include "chrome/browser/extensions/extension_host.h"
 
 // TODO(mpcomplete): I don't know what this does or if it is needed anymore,
-// now that ExtensionHost is restructured to rely on TabContents.
+// now that ExtensionHost is restructured to rely on WebContents.
 class ExtensionHostMac : public ExtensionHost {
  public:
   ExtensionHostMac(const Extension* extension,
diff --git a/chrome/browser/extensions/extension_message_handler.h b/chrome/browser/extensions/extension_message_handler.h
index fc63043..558645d 100644
--- a/chrome/browser/extensions/extension_message_handler.h
+++ b/chrome/browser/extensions/extension_message_handler.h
@@ -12,7 +12,7 @@
 
 // Filters and dispatches extension-related IPC messages that arrive from
 // renderers. There is one of these objects for each RenderViewHost in Chrome.
-// Contrast this with ExtensionTabHelper, which is only created for TabContents.
+// Contrast this with ExtensionTabHelper, which is only created for WebContents.
 //
 // TODO(aa): Handling of content script messaging should be able to move to EFD
 // once there is an EFD for every RVHD where extension code can run. Then we
diff --git a/chrome/browser/extensions/extension_tab_helper.h b/chrome/browser/extensions/extension_tab_helper.h
index 4d2f47e..79d108b 100644
--- a/chrome/browser/extensions/extension_tab_helper.h
+++ b/chrome/browser/extensions/extension_tab_helper.h
@@ -53,8 +53,8 @@ class ExtensionTabHelper
   // App extensions ------------------------------------------------------------
 
   // Sets the extension denoting this as an app. If |extension| is non-null this
-  // tab becomes an app-tab. TabContents does not listen for unload events for
-  // the extension. It's up to consumers of TabContents to do that.
+  // tab becomes an app-tab. WebContents does not listen for unload events for
+  // the extension. It's up to consumers of WebContents to do that.
   //
   // NOTE: this should only be manipulated before the tab is added to a browser.
   // TODO(sky): resolve if this is the right way to identify an app tab. If it
@@ -75,7 +75,7 @@ class ExtensionTabHelper
     return web_app_info_;
   }
 
-  // If an app extension has been explicitly set for this TabContents its icon
+  // If an app extension has been explicitly set for this WebContents its icon
   // is returned.
   //
   // NOTE: the returned icon is larger than 16x16 (its size is
@@ -90,7 +90,7 @@ class ExtensionTabHelper
     return content::WebContentsObserver::web_contents();
   }
 
-  // Sets a non-extension app icon associated with TabContents and fires an
+  // Sets a non-extension app icon associated with WebContents and fires an
   // INVALIDATE_TYPE_TITLE navigation state change to trigger repaint of title.
   void SetAppIcon(const SkBitmap& app_icon);
 
diff --git a/chrome/browser/extensions/extension_webkit_preferences.cc b/chrome/browser/extensions/extension_webkit_preferences.cc
index 18c3985..56dbe93 100644
--- a/chrome/browser/extensions/extension_webkit_preferences.cc
+++ b/chrome/browser/extensions/extension_webkit_preferences.cc
@@ -39,7 +39,7 @@ void SetPreferences(const Extension* extension,
 
   // If this is a component extension, then apply the same poliy for
   // accelerated compositing as for chrome: URLs (from
-  // TabContents::GetWebkitPrefs).  This is important for component extensions
+  // WebContents::GetWebkitPrefs).  This is important for component extensions
   // like the file manager which are sometimes loaded using chrome: URLs and
   // sometimes loaded with chrome-extension: URLs - we should expect the
   // performance characteristics to be similar in both cases.
diff --git a/chrome/browser/external_protocol/external_protocol_observer.h b/chrome/browser/external_protocol/external_protocol_observer.h
index a412733..4f6c1ff 100644
--- a/chrome/browser/external_protocol/external_protocol_observer.h
+++ b/chrome/browser/external_protocol/external_protocol_observer.h
@@ -8,7 +8,7 @@
 #include "content/public/browser/web_contents_observer.h"
 
 // ExternalProtocolObserver is responsible for handling messages from
-// TabContents relating to external protocols.
+// WebContents relating to external protocols.
 class ExternalProtocolObserver : public content::WebContentsObserver {
  public:
   explicit ExternalProtocolObserver(content::WebContents* web_contents);
diff --git a/chrome/browser/external_tab/external_tab_container_win.cc b/chrome/browser/external_tab/external_tab_container_win.cc
index d760059..13209f2 100644
--- a/chrome/browser/external_tab/external_tab_container_win.cc
+++ b/chrome/browser/external_tab/external_tab_container_win.cc
@@ -380,7 +380,7 @@ WebContents* ExternalTabContainer::OpenURLFromTab(WebContents* source,
         // TODO(ananta)
         // We should populate other fields in the
         // ViewHostMsg_FrameNavigate_Params structure. Another option could be
-        // to refactor the UpdateHistoryForNavigation function in TabContents.
+        // to refactor the UpdateHistoryForNavigation function in WebContents.
         content::FrameNavigateParams nav_params;
         nav_params.referrer = content::Referrer(referrer,
                                                 params.referrer.policy);
diff --git a/chrome/browser/external_tab/external_tab_container_win.h b/chrome/browser/external_tab/external_tab_container_win.h
index ed6f20f..ed743ab 100644
--- a/chrome/browser/external_tab/external_tab_container_win.h
+++ b/chrome/browser/external_tab/external_tab_container_win.h
@@ -46,7 +46,7 @@ class ViewProp;
 // This class serves as the container window for an external tab.
 // An external tab is a Chrome tab that is meant to displayed in an
 // external process. This class provides the FocusManger needed by the
-// TabContents as well as an implementation of content::WebContentsDelegate.
+// WebContents as well as an implementation of content::WebContentsDelegate.
 class ExternalTabContainer : public content::WebContentsDelegate,
                              public content::WebContentsObserver,
                              public content::NotificationObserver,
@@ -83,7 +83,7 @@ class ExternalTabContainer : public content::WebContentsDelegate,
             bool infobars_enabled,
             bool supports_full_tab_mode);
 
-  // Unhook the keystroke listener and notify about the closing TabContents.
+  // Unhook the keystroke listener and notify about the closing WebContents.
   // This function gets called from three places, which is fine.
   // 1. OnFinalMessage
   // 2. In the destructor.
@@ -101,7 +101,7 @@ class ExternalTabContainer : public content::WebContentsDelegate,
   // message it did not process
   void ProcessUnhandledAccelerator(const MSG& msg);
 
-  // See TabContents::FocusThroughTabTraversal.  Called from AutomationProvider.
+  // See WebContents::FocusThroughTabTraversal.  Called from AutomationProvider.
   void FocusThroughTabTraversal(bool reverse, bool restore_focus_to_view);
 
   // A helper method that tests whether the given window is an
@@ -324,7 +324,7 @@ class ExternalTabContainer : public content::WebContentsDelegate,
 
   // Top level navigations received for a tab while it is waiting for an ack
   // from the external host go here. Scenario is a window.open executes on a
-  // page in ChromeFrame. A new TabContents is created and the current
+  // page in ChromeFrame. A new WebContents is created and the current
   // ExternalTabContainer is notified via AddNewContents. At this point we
   // send off an attach tab request to the host browser. Before the host
   // browser sends over the ack, we receive a top level URL navigation for the
diff --git a/chrome/browser/favicon/favicon_handler.cc b/chrome/browser/favicon/favicon_handler.cc
index 599e7c0..c24f94f 100644
--- a/chrome/browser/favicon/favicon_handler.cc
+++ b/chrome/browser/favicon/favicon_handler.cc
@@ -138,7 +138,7 @@ void FaviconHandler::FetchFavicon(const GURL& url) {
   image_urls_.clear();
 
   // Request the favicon from the history service. In parallel to this the
-  // renderer is going to notify us (well TabContents) when the favicon url is
+  // renderer is going to notify us (well WebContents) when the favicon url is
   // available.
   if (GetFaviconService()) {
     GetFaviconForURL(url_, icon_types_, &cancelable_consumer_,
@@ -296,7 +296,7 @@ void FaviconHandler::OnDidDownloadFavicon(int id,
                                           const gfx::Image& image) {
   DownloadRequests::iterator i = download_requests_.find(id);
   if (i == download_requests_.end()) {
-    // Currently TabContents notifies us of ANY downloads so that it is
+    // Currently WebContents notifies us of ANY downloads so that it is
     // possible to get here.
     return;
   }
diff --git a/chrome/browser/favicon/favicon_handler.h b/chrome/browser/favicon/favicon_handler.h
index 288b21e..3397c35 100644
--- a/chrome/browser/favicon/favicon_handler.h
+++ b/chrome/browser/favicon/favicon_handler.h
@@ -231,7 +231,7 @@ class FaviconHandler {
 
   // Converts the FAVICON's image data to an SkBitmap and sets it on the
   // NavigationEntry.
-  // If the TabContents has a delegate, it is notified of the new favicon
+  // If the WebContents has a delegate, it is notified of the new favicon
   // (INVALIDATE_FAVICON).
   void UpdateFavicon(content::NavigationEntry* entry,
                      scoped_refptr<RefCountedMemory> data);
diff --git a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc
index 8c42a11..c9a3ff8 100644
--- a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc
+++ b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc
@@ -157,7 +157,7 @@ class GeolocationConfirmInfoBarDelegate : public ConfirmInfoBarDelegate {
   int render_process_id_;
   int render_view_id_;
   int bridge_id_;
-  // The unique id of the committed NavigationEntry of the TabContents that we
+  // The unique id of the committed NavigationEntry of the WebContents that we
   // were opened for. Used to help expire on navigations.
   int committed_contents_unique_id_;
 
@@ -683,7 +683,7 @@ void ChromeGeolocationPermissionContext::NotifyPermissionSet(
     bool allowed) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  // TabContents may have gone away (or not exists for extension).
+  // WebContents may have gone away (or not exists for extension).
   TabSpecificContentSettings* content_settings =
       TabSpecificContentSettings::Get(render_process_id, render_view_id);
   if (content_settings) {
diff --git a/chrome/browser/geolocation/geolocation_settings_state.h b/chrome/browser/geolocation/geolocation_settings_state.h
index 1b1519f..61b6a86 100644
--- a/chrome/browser/geolocation/geolocation_settings_state.h
+++ b/chrome/browser/geolocation/geolocation_settings_state.h
@@ -33,7 +33,7 @@ class GeolocationSettingsState {
   // Sets the state for |requesting_origin|.
   void OnGeolocationPermissionSet(const GURL& requesting_origin, bool allowed);
 
-  // Delegated by TabContents to indicate a navigation has happened and we
+  // Delegated by WebContents to indicate a navigation has happened and we
   // may need to clear our settings.
   void DidNavigate(const content::LoadCommittedDetails& details);
 
diff --git a/chrome/browser/history/history.h b/chrome/browser/history/history.h
index a26e71a..67089a0 100644
--- a/chrome/browser/history/history.h
+++ b/chrome/browser/history/history.h
@@ -161,9 +161,7 @@ class HistoryService : public CancelableRequestProvider,
   // The supplied render process host is used to scope the given page ID. Page
   // IDs are only unique inside a given render process, so we need that to
   // differentiate them. This pointer should not be dereferenced by the history
-  // system. Since render view host pointers may be reused (if one gets deleted
-  // and a new one created at the same address), TabContents should notify
-  // us when they are being destroyed through NotifyTabContentsDestruction.
+  // system.
   //
   // The scope/ids can be NULL if there is no meaningful tracking information
   // that can be performed on the given URL. The 'page_id' should be the ID of
diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/history/history_tab_helper.cc
index 180db54..2da50d0 100644
--- a/chrome/browser/history/history_tab_helper.cc
+++ b/chrome/browser/history/history_tab_helper.cc
@@ -99,7 +99,7 @@ void HistoryTabHelper::DidNavigateAnyFrame(
   // Most of the time, the displayURL matches the loaded URL, but for about:
   // URLs, we use a data: URL as the real value.  We actually want to save the
   // about: URL to the history db and keep the data: URL hidden. This is what
-  // the TabContents' URL getter does.
+  // the WebContents' URL getter does.
   scoped_refptr<history::HistoryAddPageArgs> add_page_args(
       CreateHistoryAddPageArgs(web_contents()->GetURL(), details, params));
   if (!web_contents()->GetDelegate() ||
diff --git a/chrome/browser/history/text_database_manager.cc b/chrome/browser/history/text_database_manager.cc
index 8164999..24f6184 100644
--- a/chrome/browser/history/text_database_manager.cc
+++ b/chrome/browser/history/text_database_manager.cc
@@ -188,7 +188,7 @@ void TextDatabaseManager::AddPageTitle(const GURL& url,
   if (found == recent_changes_.end()) {
     // This page is not in our cache of recent pages. This is very much an edge
     // case as normally a title will come in <20 seconds after the page commits,
-    // and TabContents will avoid spamming us with >1 title per page. However,
+    // and WebContents will avoid spamming us with >1 title per page. However,
     // it could come up if your connection is unhappy, and we don't want to
     // miss anything.
     //
diff --git a/chrome/browser/infobars/infobar_delegate.h b/chrome/browser/infobars/infobar_delegate.h
index 9011491..9d1f3d3 100644
--- a/chrome/browser/infobars/infobar_delegate.h
+++ b/chrome/browser/infobars/infobar_delegate.h
@@ -111,7 +111,7 @@ class InfoBarDelegate {
   // using StoreActiveEntryUniqueID automatically.
   explicit InfoBarDelegate(InfoBarTabHelper* infobar_helper);
 
-  // Store the unique id for the active entry in the specified TabContents, to
+  // Store the unique id for the active entry in the specified WebContents, to
   // be used later upon navigation to determine if this InfoBarDelegate should
   // be expired from |contents_|.
   void StoreActiveEntryUniqueID(InfoBarTabHelper* infobar_helper);
@@ -125,7 +125,7 @@ class InfoBarDelegate {
   void RemoveSelf();
 
  private:
-  // The unique id of the active NavigationEntry of the TabContents that we were
+  // The unique id of the active NavigationEntry of the WebContents that we were
   // opened for. Used to help expire on navigations.
   int contents_unique_id_;
 
diff --git a/chrome/browser/instant/instant_controller.cc b/chrome/browser/instant/instant_controller.cc
index a13a193..6d8abfa 100644
--- a/chrome/browser/instant/instant_controller.cc
+++ b/chrome/browser/instant/instant_controller.cc
@@ -328,7 +328,7 @@ void InstantController::OnAutocompleteLostFocus(
   }
 
   // Walk up the view hierarchy. If the view gaining focus is a subview of the
-  // TabContents view (such as a windowed plugin or http auth dialog), we want
+  // WebContents view (such as a windowed plugin or http auth dialog), we want
   // to keep the preview contents. Otherwise, focus has gone somewhere else,
   // such as the JS inspector, and we want to cancel the preview.
   gfx::NativeView view_gaining_focus_ancestor = view_gaining_focus;
diff --git a/chrome/browser/instant/instant_controller.h b/chrome/browser/instant/instant_controller.h
index 767e361..97c4b06 100644
--- a/chrome/browser/instant/instant_controller.h
+++ b/chrome/browser/instant/instant_controller.h
@@ -33,10 +33,10 @@ class TabContentsWrapper;
 class TemplateURL;
 class TemplateURLService;
 
-// InstantController maintains a TabContents that is intended to give a preview
+// InstantController maintains a WebContents that is intended to give a preview
 // of a URL. InstantController is owned by Browser.
 //
-// At any time the TabContents maintained by InstantController may be destroyed
+// At any time the WebContents maintained by InstantController may be destroyed
 // by way of |DestroyPreviewContents|, which results in |HideInstant| being
 // invoked on the delegate. Similarly the preview may be committed at any time
 // by invoking |CommitCurrentPreview|, which results in |CommitInstant|
@@ -71,12 +71,12 @@ class InstantController : public InstantLoaderDelegate {
   static bool CommitIfCurrent(InstantController* controller);
 
   // Invoked as the user types in the omnibox with the url to navigate to. If
-  // the url is valid and a preview TabContents has not been created, it is
+  // the url is valid and a preview WebContents has not been created, it is
   // created. If |verbatim| is true search results are shown for |user_text|
   // rather than the best guess as to what the search thought the user meant.
   // |verbatim| only matters if the AutocompleteMatch is for a search engine
   // that supports instant. Returns true if the attempt to update does not
-  // result in the preview TabContents being destroyed.
+  // result in the preview WebContents being destroyed.
   bool Update(TabContentsWrapper* tab_contents,
               const AutocompleteMatch& match,
               const string16& user_text,
@@ -89,7 +89,7 @@ class InstantController : public InstantLoaderDelegate {
   void SetOmniboxBounds(const gfx::Rect& bounds);
 
   // Notifies the delegate to hide the preview and destroys the preview
-  // TabContents. Does nothing if the preview TabContents has not been created.
+  // WebContents. Does nothing if the preview WebContents has not been created.
   void DestroyPreviewContents();
 
   // Notifies the delegate to hide the preview but leaves it around in hopes it
@@ -134,13 +134,13 @@ class InstantController : public InstantLoaderDelegate {
   // default search engine, in anticipation of the user typing a query.
   void OnAutocompleteGotFocus(TabContentsWrapper* tab_contents);
 
-  // Releases the preview TabContents passing ownership to the caller. This is
-  // intended to be called when the preview TabContents is committed. This does
+  // Releases the preview WebContents passing ownership to the caller. This is
+  // intended to be called when the preview WebContents is committed. This does
   // not notify the delegate. |tab_contents| is the underlying tab onto which
   // the preview will be committed. It can be NULL when the underlying tab is
   // irrelevant, for example when |type| is INSTANT_COMMIT_DESTROY.
   // WARNING: be sure and invoke CompleteRelease after adding the returned
-  // TabContents to a tabstrip.
+  // WebContents to a tabstrip.
   TabContentsWrapper* ReleasePreviewContents(InstantCommitType type,
                                              TabContentsWrapper* tab_contents);
 
@@ -148,14 +148,15 @@ class InstantController : public InstantLoaderDelegate {
   // Invoke this if you explicitly invoke ReleasePreviewContents.
   void CompleteRelease(TabContentsWrapper* tab);
 
-  // TabContents the match is being shown for.
+  // TabContentsWrapper the match is being shown for.
   TabContentsWrapper* tab_contents() const { return tab_contents_; }
 
-  // The preview TabContents; may be null.
+  // The preview TabContentsWrapper; may be null.
   TabContentsWrapper* GetPreviewContents() const;
 
-  // Returns true if the preview TabContents is ready to be displayed. In some
-  // situations this may return false yet GetPreviewContents() returns non-NULL.
+  // Returns true if the preview TabContentsWrapper is ready to be displayed. In
+  // some situations this may return false yet GetPreviewContents() returns
+  // non-NULL.
   bool is_displayable() const { return is_displayable_; }
 
   // Returns the transition type of the last AutocompleteMatch passed to Update.
@@ -210,7 +211,7 @@ class InstantController : public InstantLoaderDelegate {
 
   // Deletes |loader| after a delay. At the time we determine a site doesn't
   // want to participate in instant we can't destroy the loader (because
-  // destroying the loader destroys the TabContents and the TabContents is on
+  // destroying the loader destroys the WebContents and the WebContents is on
   // the stack). Instead we place the loader in |loaders_to_destroy_| and
   // schedule a task.
   void ScheduleDestroy(InstantLoader* loader);
@@ -224,7 +225,7 @@ class InstantController : public InstantLoaderDelegate {
   // don't own this pointer.
   TemplateURLService* template_url_service_;
 
-  // The TabContents last passed to |Update|.
+  // The TabContentsWrapper last passed to |Update|.
   TabContentsWrapper* tab_contents_;
 
   // True if |loader_| is ready to be displayed.
diff --git a/chrome/browser/instant/instant_delegate.h b/chrome/browser/instant/instant_delegate.h
index d577606..2f09c25 100644
--- a/chrome/browser/instant/instant_delegate.h
+++ b/chrome/browser/instant/instant_delegate.h
@@ -19,15 +19,15 @@ class Rect;
 // InstantController for details.
 class InstantDelegate {
  public:
-  // Invoked when the instant TabContents should be shown.
+  // Invoked when the instant TabContentsWrapper should be shown.
   virtual void ShowInstant(TabContentsWrapper* preview_contents) = 0;
 
-  // Invoked when the instant TabContents should be hidden.
+  // Invoked when the instant TabContentsWrapper should be hidden.
   virtual void HideInstant() = 0;
 
   // Invoked when the user does something that should result in the preview
-  // TabContents becoming the active TabContents. The delegate takes ownership
-  // of the supplied TabContents.
+  // TabContentsWrapper becoming the active TabContentsWrapper. The delegate
+  // takes ownership of the supplied TabContentsWrapper.
   virtual void CommitInstant(TabContentsWrapper* preview_contents) = 0;
 
   // Invoked when the suggested text is to change to |text|.
diff --git a/chrome/browser/instant/instant_loader.cc b/chrome/browser/instant/instant_loader.cc
index dce9349..d280bcb0 100644
--- a/chrome/browser/instant/instant_loader.cc
+++ b/chrome/browser/instant/instant_loader.cc
@@ -641,8 +641,8 @@ InstantLoader::InstantLoader(InstantLoaderDelegate* delegate,
 InstantLoader::~InstantLoader() {
   registrar_.RemoveAll();
 
-  // Delete the TabContents before the delegate as the TabContents holds a
-  // reference to the delegate.
+  // Delete the TabContentsWrapper before the delegate as the TabContentsWrapper
+  // holds a reference to the delegate.
   if (preview_contents())
     AddPreviewUsageForHistogram(template_url_id_, PREVIEW_DELETED, group_);
   preview_contents_.reset();
diff --git a/chrome/browser/instant/instant_loader.h b/chrome/browser/instant/instant_loader.h
index e5a8019..2df45ffe 100644
--- a/chrome/browser/instant/instant_loader.h
+++ b/chrome/browser/instant/instant_loader.h
@@ -54,8 +54,8 @@ class InstantLoader : public content::NotificationObserver {
                 const std::string& group);
   virtual ~InstantLoader();
 
-  // Invoked to load a URL. |tab_contents| is the TabContents the preview is
-  // going to be shown on top of and potentially replace. Returns true if the
+  // Invoked to load a URL. |tab_contents| is the TabContentsWrapper the preview
+  // is going to be shown on top of and potentially replace. Returns true if the
   // arguments differ from the last call to |Update|.
   bool Update(TabContentsWrapper* tab_contents,
               const TemplateURL* template_url,
@@ -74,11 +74,12 @@ class InstantLoader : public content::NotificationObserver {
   // content.
   bool IsMouseDownFromActivate();
 
-  // Releases the preview TabContents passing ownership to the caller. This is
-  // intended to be called when the preview TabContents is committed. This does
-  // not notify the delegate. |tab_contents| is the underlying tab onto which
-  // the preview will be committed. It can be NULL when the underlying tab is
-  // irrelevant, for example when |type| is INSTANT_COMMIT_DESTROY.
+  // Releases the preview TabContentsWrapper passing ownership to the caller.
+  // This is intended to be called when the preview TabContentsWrapper is
+  // committed. This does not notify the delegate. |tab_contents| is the
+  // underlying tab onto which the preview will be committed. It can be NULL
+  // when the underlying tab is irrelevant, for example when |type| is
+  // INSTANT_COMMIT_DESTROY.
   TabContentsWrapper* ReleasePreviewContents(InstantCommitType type,
                                              TabContentsWrapper* tab_contents);
 
@@ -91,7 +92,7 @@ class InstantLoader : public content::NotificationObserver {
   void MaybeLoadInstantURL(TabContentsWrapper* tab_contents,
                            const TemplateURL* template_url);
 
-  // Returns true if the preview NavigationController's TabContents has a
+  // Returns true if the preview NavigationController's WebContents has a
   // pending NavigationEntry.
   bool IsNavigationPending() const;
 
@@ -100,14 +101,14 @@ class InstantLoader : public content::NotificationObserver {
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
-  // The preview TabContents; may be null.
+  // The preview TabContentsWrapper; may be null.
   TabContentsWrapper* preview_contents() const {
     return preview_contents_.get();
   }
 
-  // Returns true if the preview TabContents is ready to be shown. A non-instant
-  // loader is ready once the renderer paints, otherwise it isn't ready until we
-  // get a response back from the page.
+  // Returns true if the preview TabContentsWrapper is ready to be shown. A
+  // non-instant loader is ready once the renderer paints, otherwise it isn't
+  // ready until we get a response back from the page.
   bool ready() const { return ready_; }
 
   // Returns true if the current load returned a 200.
@@ -207,11 +208,11 @@ class InstantLoader : public content::NotificationObserver {
   // The url we're displaying.
   GURL url_;
 
-  // Delegate of the preview TabContents. Used to detect when the user does some
-  // gesture on the TabContents and the preview needs to be activated.
+  // Delegate of the preview WebContents. Used to detect when the user does some
+  // gesture on the WebContents and the preview needs to be activated.
   scoped_ptr<TabContentsDelegateImpl> preview_tab_contents_delegate_;
 
-  // The preview TabContents; may be null.
+  // The preview TabContentsWrapper; may be null.
   scoped_ptr<TabContentsWrapper> preview_contents_;
 
   // Is the preview_contents ready to be shown?
diff --git a/chrome/browser/instant/instant_loader_delegate.h b/chrome/browser/instant/instant_loader_delegate.h
index 500e35e..b7eb31b 100644
--- a/chrome/browser/instant/instant_loader_delegate.h
+++ b/chrome/browser/instant/instant_loader_delegate.h
@@ -45,7 +45,7 @@ class InstantLoaderDelegate {
   // Adds the specified url to the set of urls instant won't prefetch for.
   virtual void AddToBlacklist(InstantLoader* loader, const GURL& url) = 0;
 
-  // Invoked if the loader swaps to a different TabContents.
+  // Invoked if the loader swaps to a different WebContents.
   virtual void SwappedTabContents(InstantLoader* loader) = 0;
 
   // Invoked when the webcontents created by the loader is focused.
diff --git a/chrome/browser/instant/instant_unload_handler.cc b/chrome/browser/instant/instant_unload_handler.cc
index 36f4958..a6a689f 100644
--- a/chrome/browser/instant/instant_unload_handler.cc
+++ b/chrome/browser/instant/instant_unload_handler.cc
@@ -15,8 +15,8 @@
 
 using content::WebContents;
 
-// TabContentsDelegate implementation. This owns the TabContents supplied to the
-// constructor.
+// TabContentsDelegate implementation. This owns the TabContentsWrapper supplied
+// to the constructor.
 class InstantUnloadHandler::TabContentsDelegateImpl
     : public content::WebContentsDelegate {
  public:
@@ -93,7 +93,7 @@ void InstantUnloadHandler::RunUnloadListenersOrDestroy(TabContentsWrapper* tab,
 }
 
 void InstantUnloadHandler::Activate(TabContentsDelegateImpl* delegate) {
-  // Take ownership of the TabContents from the delegate.
+  // Take ownership of the TabContentsWrapper from the delegate.
   TabContentsWrapper* tab = delegate->ReleaseTab();
   browser::NavigateParams params(browser_, tab);
   params.disposition = NEW_FOREGROUND_TAB;
diff --git a/chrome/browser/memory_details.cc b/chrome/browser/memory_details.cc
index 74e99f2..64d3a87 100644
--- a/chrome/browser/memory_details.cc
+++ b/chrome/browser/memory_details.cc
@@ -191,7 +191,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
       extensions::ProcessMap* extension_process_map =
           extension_service->process_map();
 
-      // The RenderProcessHost may host multiple TabContents.  Any
+      // The RenderProcessHost may host multiple WebContentses.  Any
       // of them which contain diagnostics information make the whole
       // process be considered a diagnostics process.
       content::RenderProcessHost::RenderWidgetHostsIterator iter(
diff --git a/chrome/browser/oom_priority_manager.cc b/chrome/browser/oom_priority_manager.cc
index 3ccb4cd..3dc9353 100644
--- a/chrome/browser/oom_priority_manager.cc
+++ b/chrome/browser/oom_priority_manager.cc
@@ -54,8 +54,8 @@ const int kAdjustmentIntervalSeconds = 10;
 // currently focused tab.
 const int kFocusedTabScoreAdjustIntervalMs = 500;
 
-// Returns a unique ID for a TabContents.  Do not cast back to a pointer, as
-// the TabContents could be deleted if the user closed the tab.
+// Returns a unique ID for a WebContents.  Do not cast back to a pointer, as
+// the WebContents could be deleted if the user closed the tab.
 int64 IdFromTabContents(WebContents* web_contents) {
   return reinterpret_cast<int64>(web_contents);
 }
diff --git a/chrome/browser/oom_priority_manager.h b/chrome/browser/oom_priority_manager.h
index 54e2b17..e53d478 100644
--- a/chrome/browser/oom_priority_manager.h
+++ b/chrome/browser/oom_priority_manager.h
@@ -62,7 +62,7 @@ class OomPriorityManager : public content::NotificationObserver {
     base::ProcessHandle renderer_handle;
     bool sudden_termination_allowed;
     string16 title;
-    int64 tab_contents_id;  // unique ID per TabContents
+    int64 tab_contents_id;  // unique ID per WebContents
   };
   typedef std::vector<TabStats> TabStatsList;
 
diff --git a/chrome/browser/password_manager/password_manager.h b/chrome/browser/password_manager/password_manager.h
index cfe2058..8b386d4 100644
--- a/chrome/browser/password_manager/password_manager.h
+++ b/chrome/browser/password_manager/password_manager.h
@@ -96,7 +96,7 @@ class PasswordManager : public LoginModel,
   scoped_ptr<PasswordFormManager> provisional_save_manager_;
 
   // Our delegate for carrying out external operations.  This is typically the
-  // containing TabContents.
+  // containing WebContents.
   PasswordManagerDelegate* const delegate_;
 
   // The LoginModelObserver (i.e LoginView) requiring autofill.
diff --git a/chrome/browser/password_manager/password_manager_delegate.h b/chrome/browser/password_manager/password_manager_delegate.h
index db68dc5..a59123a 100644
--- a/chrome/browser/password_manager/password_manager_delegate.h
+++ b/chrome/browser/password_manager/password_manager_delegate.h
@@ -15,7 +15,7 @@ struct PasswordFormFillData;
 class PasswordFormManager;
 class Profile;
 
-// An abstraction of operations in the external environment (TabContents)
+// An abstraction of operations in the external environment (WebContents)
 // that the PasswordManager depends on.  This allows for more targeted
 // unit testing.
 class PasswordManagerDelegate {
diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
index f75dc68..0b86363 100644
--- a/chrome/browser/prerender/prerender_browsertest.cc
+++ b/chrome/browser/prerender/prerender_browsertest.cc
@@ -169,7 +169,7 @@ class TestPrerenderContents : public PrerenderContents {
       EXPECT_TRUE(was_hidden_);
 
     // A used PrerenderContents will only be destroyed when we swap out
-    // TabContents, at the end of a navigation caused by a call to
+    // WebContents, at the end of a navigation caused by a call to
     // NavigateToURLImpl().
     if (final_status() == FINAL_STATUS_USED)
       EXPECT_TRUE(new_render_view_host_);
@@ -1421,7 +1421,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderTaskManager) {
   // Start with two resources.
   PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1);
 
-  // One of the resources that has a TabContents associated with it should have
+  // One of the resources that has a WebContents associated with it should have
   // the Prerender prefix.
   const string16 prefix =
       l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_PRERENDER_PREFIX, string16());
diff --git a/chrome/browser/prerender/prerender_contents.cc b/chrome/browser/prerender/prerender_contents.cc
index 9b17de6..aefc32e 100644
--- a/chrome/browser/prerender/prerender_contents.cc
+++ b/chrome/browser/prerender/prerender_contents.cc
@@ -180,7 +180,7 @@ class PrerenderContents::TabContentsDelegateImpl
     return prerender_contents_->ShouldSuppressDialogs();
   }
 
-  // Commits the History of Pages to the given TabContents.
+  // Commits the History of Pages to the given TabContentsWrapper.
   void CommitHistory(TabContentsWrapper* tab) {
     for (size_t i = 0; i < add_page_vector_.size(); ++i)
       tab->history_tab_helper()->UpdateHistoryForNavigation(
@@ -316,7 +316,7 @@ void PrerenderContents::StartPrerendering(
   tab_contents_delegate_.reset(new TabContentsDelegateImpl(this));
   new_contents->SetDelegate(tab_contents_delegate_.get());
 
-  // Set the size of the prerender TabContents.
+  // Set the size of the prerender WebContents.
   prerender_contents_->web_contents()->GetView()->SizeContents(
       tab_bounds.size());
 
@@ -410,7 +410,7 @@ PrerenderContents::~PrerenderContents() {
     }
   }
 
-  // If we still have a TabContents, clean up anything we need to and then
+  // If we still have a WebContents, clean up anything we need to and then
   // destroy it.
   if (prerender_contents_.get())
     delete ReleasePrerenderContents();
@@ -454,11 +454,11 @@ void PrerenderContents::Observe(int type,
         content::Details<RenderViewHost> new_render_view_host(details);
         OnRenderViewHostCreated(new_render_view_host.ptr());
 
-        // When a new RenderView is created for a prerendering TabContents,
+        // When a new RenderView is created for a prerendering WebContents,
         // tell the new RenderView it's being used for prerendering before any
         // navigations occur.  Note that this is always triggered before the
         // first navigation, so there's no need to send the message just after
-        // the TabContents is created.
+        // the WebContents is created.
         new_render_view_host->Send(
             new PrerenderMsg_SetIsPrerendering(
                 new_render_view_host->GetRoutingID(),
diff --git a/chrome/browser/prerender/prerender_contents.h b/chrome/browser/prerender/prerender_contents.h
index 2463ed9..feeb4f4 100644
--- a/chrome/browser/prerender/prerender_contents.h
+++ b/chrome/browser/prerender/prerender_contents.h
@@ -40,11 +40,6 @@ class PrerenderManager;
 class PrerenderRenderViewHostObserver;
 class PrerenderTracker;
 
-// This class is a peer of TabContents. It can host a renderer, but does not
-// have any visible display. Its navigation is not managed by a
-// NavigationController because is has no facility for navigating (other than
-// programatically view window.location.href) or RenderViewHostManager because
-// it is never allowed to navigate across a SiteInstance boundary.
 class PrerenderContents : public content::NotificationObserver,
                           public content::WebContentsObserver {
  public:
@@ -187,7 +182,7 @@ class PrerenderContents : public content::NotificationObserver,
   // Adds all alias URLs from another prerender.
   void AddAliasURLsFromOtherPrerenderContents(PrerenderContents* other_pc);
 
-  // The preview TabContents (may be null).
+  // The preview TabContentsWrapper (may be null).
   TabContentsWrapper* prerender_contents() const {
     return prerender_contents_.get();
   }
@@ -282,7 +277,7 @@ class PrerenderContents : public content::NotificationObserver,
   // RenderViewHostDelegate has received from the RenderView.
   // Used to apply to the new RenderViewHost delegate that might eventually
   // own the contained RenderViewHost when the prerendered page is shown
-  // in a TabContents.
+  // in a WebContents.
   string16 title_;
   int32 page_id_;
   GURL url_;
@@ -323,7 +318,7 @@ class PrerenderContents : public content::NotificationObserver,
   // RenderViewHost for this object.
   scoped_ptr<base::ProcessMetrics> process_metrics_;
 
-  // The prerendered TabContents; may be null.
+  // The prerendered TabContentsWrapper; may be null.
   scoped_ptr<TabContentsWrapper> prerender_contents_;
 
   scoped_ptr<PrerenderRenderViewHostObserver> render_view_host_observer_;
diff --git a/chrome/browser/prerender/prerender_manager.cc b/chrome/browser/prerender/prerender_manager.cc
index 3825abf..a372f71 100644
--- a/chrome/browser/prerender/prerender_manager.cc
+++ b/chrome/browser/prerender/prerender_manager.cc
@@ -394,7 +394,7 @@ bool PrerenderManager::MaybeUsePrerenderedPage(WebContents* web_contents,
   }
 
   // If we don't want to use prerenders at all, we are done.
-  // For bookkeeping purposes, we need to mark this TabContents to
+  // For bookkeeping purposes, we need to mark this WebContents to
   // reflect that it would have been prerendered.
   if (GetMode() == PRERENDER_MODE_EXPERIMENT_NO_USE_GROUP) {
     MarkWebContentsAsWouldBePrerendered(web_contents);
@@ -534,7 +534,7 @@ void PrerenderManager::MoveEntryToPendingDelete(PrerenderContents* entry,
   AddToHistory(entry);
   pending_delete_list_.push_back(entry);
 
-  // Destroy the old TabContents relatively promptly to reduce resource usage,
+  // Destroy the old WebContents relatively promptly to reduce resource usage,
   // and in the case of HTML5 media, reduce the change of playing any sound.
   PostCleanupTask();
 }
diff --git a/chrome/browser/prerender/prerender_manager.h b/chrome/browser/prerender/prerender_manager.h
index 101adba..15f5011 100644
--- a/chrome/browser/prerender/prerender_manager.h
+++ b/chrome/browser/prerender/prerender_manager.h
@@ -196,7 +196,7 @@ class PrerenderManager : public base::SupportsWeakPtr<PrerenderManager>,
   // Clears the data indicated by which bits of clear_flags are set.
   //
   // If the CLEAR_PRERENDER_CONTENTS bit is set, all active prerenders are
-  // cancelled and then deleted, and any TabContents queued for destruction are
+  // cancelled and then deleted, and any WebContents queued for destruction are
   // destroyed as well.
   //
   // If the CLEAR_PRERENDER_HISTORY bit is set, the prerender history is
@@ -310,7 +310,7 @@ class PrerenderManager : public base::SupportsWeakPtr<PrerenderManager>,
   void MaybeStopSchedulingPeriodicCleanups();
 
   // Deletes stale and cancelled prerendered PrerenderContents, as well as
-  // TabContents that have been replaced by prerendered TabContents.
+  // WebContents that have been replaced by prerendered WebContents.
   // Also identifies and kills PrerenderContents that use too much
   // resources.
   void PeriodicCleanup();
@@ -351,8 +351,8 @@ class PrerenderManager : public base::SupportsWeakPtr<PrerenderManager>,
 
   bool DoesRateLimitAllowPrerender() const;
 
-  // Deletes old TabContents that have been replaced by prerendered ones.  This
-  // is needed because they're replaced in a callback from the old TabContents,
+  // Deletes old WebContents that have been replaced by prerendered ones.  This
+  // is needed because they're replaced in a callback from the old WebContents,
   // so cannot immediately be deleted.
   void DeleteOldTabContents();
 
@@ -372,7 +372,7 @@ class PrerenderManager : public base::SupportsWeakPtr<PrerenderManager>,
   base::Value* GetActivePrerendersAsValue() const;
 
   // Destroys all pending prerenders using FinalStatus.  Also deletes them as
-  // well as any swapped out TabContents queued for destruction.
+  // well as any swapped out WebContents queued for destruction.
   // Used both on destruction, and when clearing the browsing history.
   void DestroyAllContents(FinalStatus final_status);
 
@@ -418,10 +418,10 @@ class PrerenderManager : public base::SupportsWeakPtr<PrerenderManager>,
   // List of prerender elements to be deleted
   std::list<PrerenderContents*> pending_delete_list_;
 
-  // Set of TabContents which are currently displaying a prerendered page.
+  // Set of WebContents which are currently displaying a prerendered page.
   base::hash_set<content::WebContents*> prerendered_tab_contents_set_;
 
-  // Set of TabContents which would be displaying a prerendered page
+  // Set of WebContents which would be displaying a prerendered page
   // (for the control group).
   base::hash_set<content::WebContents*> would_be_prerendered_tab_contents_set_;
 
diff --git a/chrome/browser/prerender/prerender_tab_helper.h b/chrome/browser/prerender/prerender_tab_helper.h
index 1631830..86c7a5f 100644
--- a/chrome/browser/prerender/prerender_tab_helper.h
+++ b/chrome/browser/prerender/prerender_tab_helper.h
@@ -35,7 +35,7 @@ class PrerenderTabHelper : public content::WebContentsObserver {
       bool is_error_page,
       content::RenderViewHost* render_view_host) OVERRIDE;
 
-  // Called when this prerendered TabContents has just been swapped in.
+  // Called when this prerendered WebContents has just been swapped in.
   void PrerenderSwappedIn();
 
   void UpdateTargetURL(int32 page_id, const GURL& url);
@@ -47,7 +47,7 @@ class PrerenderTabHelper : public content::WebContentsObserver {
   // Retrieves the PrerenderManager, or NULL, if none was found.
   PrerenderManager* MaybeGetPrerenderManager() const;
 
-  // Returns whether the TabContents being observed is currently prerendering.
+  // Returns whether the WebContents being observed is currently prerendering.
   bool IsPrerendering();
 
   // Records histogram information for the current hover, based on whether