TabContents -> WebContentsImpl, part 14.

Updated comments.

BUG=105875
TEST=no change


Review URL: http://codereview.chromium.org/10073023

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

25 files changed, 72 insertions, 82 deletions

diff --git a/content/browser/cross_site_request_manager.h b/content/browser/cross_site_request_manager.h
index 1274264..186d62e 100644
--- a/content/browser/cross_site_request_manager.h
+++ b/content/browser/cross_site_request_manager.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -16,7 +16,7 @@ template <typename T> struct DefaultSingletonTraits;
 
 // CrossSiteRequestManager is used to handle bookkeeping for cross-site
 // requests and responses between the UI and IO threads.  Such requests involve
-// a transition from one RenderViewHost to another within TabContents, and
+// a transition from one RenderViewHost to another within WebContentsImpl, and
 // involve coordination with ResourceDispatcherHost.
 //
 // CrossSiteRequestManager is a singleton that may be used on any thread.
diff --git a/content/browser/renderer_host/resource_dispatcher_host_uitest.cc b/content/browser/renderer_host/resource_dispatcher_host_uitest.cc
index 1ed043e..df6f1b8 100644
--- a/content/browser/renderer_host/resource_dispatcher_host_uitest.cc
+++ b/content/browser/renderer_host/resource_dispatcher_host_uitest.cc
@@ -366,7 +366,7 @@ TEST_F(ResourceDispatcherTest, DISABLED_CrossSiteNavigationErrorPage) {
   // Check that renderer-initiated navigations still work.  In a previous bug,
   // the ResourceDispatcherHost would think that such navigations were
   // cross-site, because we didn't clean up from the previous request.  Since
-  // TabContents was in the NORMAL state, it would ignore the attempt to run
+  // WebContentsImpl was in the NORMAL state, it would ignore the attempt to run
   // the onunload handler, and the navigation would fail. We can't test by
   // redirecting to javascript:window.location='someURL', since javascript:
   // URLs are prohibited by policy from interacting with sensitive chrome
diff --git a/content/browser/site_instance_impl_unittest.cc b/content/browser/site_instance_impl_unittest.cc
index 08d1f2a..da055f4 100644
--- a/content/browser/site_instance_impl_unittest.cc
+++ b/content/browser/site_instance_impl_unittest.cc
@@ -206,7 +206,7 @@ class TestSiteInstance : public SiteInstanceImpl {
 
 // Test to ensure no memory leaks for SiteInstance objects.
 TEST_F(SiteInstanceTest, SiteInstanceDestructor) {
-  // The existence of this object will cause TabContents to create our
+  // The existence of this object will cause WebContentsImpl to create our
   // test one instead of the real one.
   content::RenderViewHostTestEnabler rvh_test_enabler;
   int site_delete_counter = 0;
@@ -258,7 +258,7 @@ TEST_F(SiteInstanceTest, SiteInstanceDestructor) {
     EXPECT_EQ(1, browsing_delete_counter);
   }
 
-  // Make sure that we flush any messages related to the above TabContents
+  // Make sure that we flush any messages related to the above WebContentsImpl
   // destruction.
   MessageLoop::current()->RunAllPending();
 
diff --git a/content/browser/speech/speech_recognition_manager_impl.cc b/content/browser/speech/speech_recognition_manager_impl.cc
index ed69eed..4c650ae5 100644
--- a/content/browser/speech/speech_recognition_manager_impl.cc
+++ b/content/browser/speech/speech_recognition_manager_impl.cc
@@ -152,12 +152,12 @@ void SpeechRecognitionManagerImpl::CheckRenderViewTypeAndStartRecognition(
   if (!render_view_host || !render_view_host->GetDelegate())
     return;
 
-  // For host delegates other than TabContents we can't reliably show a popup,
-  // including the speech input bubble. In these cases for privacy reasons we
-  // don't want to start recording if the user can't be properly notified.
-  // An example of this is trying to show the speech input bubble within an
-  // extension popup: http://crbug.com/92083. In these situations the speech
-  // input extension API should be used instead.
+  // For host delegates other than VIEW_TYPE_TAB_CONTENTS we can't reliably show
+  // a popup, including the speech input bubble. In these cases for privacy
+  // reasons we don't want to start recording if the user can't be properly
+  // notified. An example of this is trying to show the speech input bubble
+  // within an extension popup: http://crbug.com/92083. In these situations the
+  // speech input extension API should be used instead.
   if (render_view_host->GetDelegate()->GetRenderViewType() ==
       content::VIEW_TYPE_TAB_CONTENTS) {
     BrowserThread::PostTask(
diff --git a/content/browser/ssl/ssl_cert_error_handler.cc b/content/browser/ssl/ssl_cert_error_handler.cc
index 2975797..9acd5df 100644
--- a/content/browser/ssl/ssl_cert_error_handler.cc
+++ b/content/browser/ssl/ssl_cert_error_handler.cc
@@ -33,10 +33,9 @@ SSLCertErrorHandler* SSLCertErrorHandler::AsSSLCertErrorHandler() {
 }
 
 void SSLCertErrorHandler::OnDispatchFailed() {
-  // Requests that don't have a tab (i.e. requests from extensions) will fail
-  // to dispatch because they don't have a TabContents. See crbug.com/86537. In
-  // this case we have to make a decision in this function, so we ignore
-  // revocation check failures.
+  // Requests can fail to dispatch because they don't have a WebContents. See
+  // <http://crbug.com/86537>. In this case we have to make a decision in this
+  // function, so we ignore revocation check failures.
   if (net::IsCertStatusMinorError(ssl_info().cert_status)) {
     ContinueRequest();
   } else {
diff --git a/content/browser/ssl/ssl_manager.h b/content/browser/ssl/ssl_manager.h
index a51555d..101f1c9 100644
--- a/content/browser/ssl/ssl_manager.h
+++ b/content/browser/ssl/ssl_manager.h
@@ -34,7 +34,7 @@ namespace net {
 class SSLInfo;
 }
 
-// The SSLManager SSLManager controls the SSL UI elements in a TabContents.  It
+// The SSLManager SSLManager controls the SSL UI elements in a WebContents.  It
 // listens for various events that influence when these elements should or
 // should not be displayed and adjusts them accordingly.
 //
diff --git a/content/browser/ssl/ssl_policy.h b/content/browser/ssl/ssl_policy.h
index 686d5c2..b3b0fa1 100644
--- a/content/browser/ssl/ssl_policy.h
+++ b/content/browser/ssl/ssl_policy.h
@@ -40,7 +40,7 @@ class SSLPolicy {
   void OnRequestStarted(SSLRequestInfo* info);
 
   // Update the SSL information in |entry| to match the current state.
-  // |tab_contents| is the TabContents associated with this entry.
+  // |web_contents| is the WebContentsImpl associated with this entry.
   void UpdateEntry(content::NavigationEntryImpl* entry,
                    WebContentsImpl* web_contents);
 
diff --git a/content/browser/webui/web_ui_impl.h b/content/browser/webui/web_ui_impl.h
index 28b7360..5767392 100644
--- a/content/browser/webui/web_ui_impl.h
+++ b/content/browser/webui/web_ui_impl.h
@@ -22,9 +22,9 @@ class CONTENT_EXPORT WebUIImpl : public content::WebUI,
   explicit WebUIImpl(content::WebContents* contents);
   virtual ~WebUIImpl();
 
-  // Called by TabContents when the RenderView is first created. This is *not*
-  // called for every page load because in some cases RenderViewHostManager will
-  // reuse RenderView instances.
+  // Called by WebContentsImpl when the RenderView is first created. This is
+  // *not* called for every page load because in some cases
+  // RenderViewHostManager will reuse RenderView instances.
   void RenderViewCreated(content::RenderViewHost* render_view_host);
 
   // WebUI implementation:
diff --git a/content/common/npobject_util.h b/content/common/npobject_util.h
index aab6b62..e7c9ceb 100644
--- a/content/common/npobject_util.h
+++ b/content/common/npobject_util.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 //
@@ -60,7 +60,7 @@ bool CreateNPVariant(const NPVariant_Param& param,
                      const GURL& page_url);
 
 #if defined(OS_WIN)
-// Given a plugin's HWND, returns an event associated with the TabContents
+// Given a plugin's HWND, returns an event associated with the WebContentsImpl
 // that's set when inside a messagebox.  This tells the plugin process that
 // the message queue should be pumped (as what would happen if everything was
 // in-process).  This avoids deadlocks when a plugin invokes javascript that
diff --git a/content/common/view_messages.h b/content/common/view_messages.h
index 246dc4a..7a54339 100644
--- a/content/common/view_messages.h
+++ b/content/common/view_messages.h
@@ -1174,7 +1174,7 @@ IPC_MESSAGE_ROUTED2(ViewMsg_SavePageAsMHTML,
                     int /* job_id */,
                     IPC::PlatformFileForTransit /* file handle */)
 
-// Temporary message to diagnose an unexpected condition in TabContents.
+// Temporary message to diagnose an unexpected condition in WebContentsImpl.
 IPC_MESSAGE_CONTROL1(ViewMsg_TempCrashWithData,
                      GURL /* data */)
 
@@ -1196,7 +1196,7 @@ IPC_SYNC_MESSAGE_CONTROL1_3(ViewHostMsg_CreateWindow,
                             int64 /* cloned_session_storage_namespace_id */)
 
 // Similar to ViewHostMsg_CreateWindow, except used for sub-widgets, like
-// <select> dropdowns.  This message is sent to the TabContents that
+// <select> dropdowns.  This message is sent to the WebContentsImpl that
 // contains the widget being created.
 IPC_SYNC_MESSAGE_CONTROL2_2(ViewHostMsg_CreateWidget,
                             int /* opener_id */,
diff --git a/content/public/browser/devtools_client_host.h b/content/public/browser/devtools_client_host.h
index 6c9a218..ef23c3e 100644
--- a/content/public/browser/devtools_client_host.h
+++ b/content/public/browser/devtools_client_host.h
@@ -43,8 +43,8 @@ class CONTENT_EXPORT DevToolsClientHost {
   // Invoked when the contents are replaced by another contents.
   virtual void ContentsReplaced(WebContents* new_contents) = 0;
 
-  // Creates DevToolsClientHost for TabContents containing default DevTools
-  // frontend implementation.
+  // Creates a DevToolsClientHost for a WebContents containing the default
+  // DevTools frontend implementation.
   static DevToolsClientHost* CreateDevToolsFrontendHost(
       WebContents* client_web_contents,
       DevToolsFrontendHostDelegate* delegate);
diff --git a/content/public/browser/navigation_entry.h b/content/public/browser/navigation_entry.h
index a485100..87923ea 100644
--- a/content/public/browser/navigation_entry.h
+++ b/content/public/browser/navigation_entry.h
@@ -23,7 +23,7 @@ struct SSLStatus;
 
 // A NavigationEntry is a data structure that captures all the information
 // required to recreate a browsing state. This includes some opaque binary
-// state as provided by the TabContents as well as some clear text title and
+// state as provided by the WebContentsImpl as well as some clear text title and
 // URL which is used for our user interface.
 class NavigationEntry {
  public:
diff --git a/content/public/browser/notification_types.h b/content/public/browser/notification_types.h
index 797d7bd..09fbe9f 100644
--- a/content/public/browser/notification_types.h
+++ b/content/public/browser/notification_types.h
@@ -215,7 +215,7 @@ enum NotificationType {
   // expected.
   NOTIFICATION_WEB_CONTENTS_CONNECTED,
 
-  // This notification is sent when a TabContents swaps its render view host
+  // This notification is sent when a WebContents swaps its render view host
   // with another one, possibly changing processes. The source is a
   // Source<WebContents> with a pointer to the WebContents.  A
   // TAB_CONTENTS_DISCONNECTED notification is guaranteed before the
@@ -227,7 +227,7 @@ enum NotificationType {
   // the WebContents (the pointer is usable).  No details are expected.
   NOTIFICATION_WEB_CONTENTS_DISCONNECTED,
 
-  // This notification is sent after TabContents' title is updated. The source
+  // This notification is sent after WebContents' title is updated. The source
   // is a Source<WebContents> with a pointer to the WebContents. The details
   // is a std::pair<NavigationEntry*, bool> that contains more information.
   NOTIFICATION_WEB_CONTENTS_TITLE_UPDATED,
@@ -280,9 +280,9 @@ enum NotificationType {
   // hung view, and no details are expected.
   NOTIFICATION_RENDERER_PROCESS_HANG,
 
-  // This is sent to notify that the RenderViewHost displayed in a
-  // TabContents has changed.  Source is the NavigationController for which the
-  // change happened, details is a
+  // This is sent to notify that the RenderViewHost displayed in a WebContents
+  // has changed.  Source is the NavigationController for which the change
+  // happened, details is a
   // std::pair::<old RenderViewHost, new RenderViewHost>).
   NOTIFICATION_RENDER_VIEW_HOST_CHANGED,
 
diff --git a/content/public/browser/page_navigator.h b/content/public/browser/page_navigator.h
index 5296d557..72628ae 100644
--- a/content/public/browser/page_navigator.h
+++ b/content/public/browser/page_navigator.h
@@ -70,7 +70,7 @@ class PageNavigator {
 
   // Opens a URL with the given disposition.  The transition specifies how this
   // navigation should be recorded in the history system (for example, typed).
-  // Returns the TabContents the URL is opened in, or NULL if the URL wasn't
+  // Returns the WebContents the URL is opened in, or NULL if the URL wasn't
   // opened immediately.
   virtual WebContents* OpenURL(const OpenURLParams& params) = 0;
 };
diff --git a/content/public/browser/render_view_host.h b/content/public/browser/render_view_host.h
index 707975d..991c868 100644
--- a/content/public/browser/render_view_host.h
+++ b/content/public/browser/render_view_host.h
@@ -46,7 +46,7 @@ struct SelectedFileInfo;
 //
 // The intent of this interface is to provide a view-agnostic communication
 // conduit with a renderer. This is so we can build HTML views not only as
-// TabContents (see TabContents for an example) but also as views, etc.
+// WebContents (see WebContents for an example) but also as views, etc.
 class CONTENT_EXPORT RenderViewHost : virtual public RenderWidgetHost {
  public:
   // Returns the RenderViewHost given its ID and the ID of its render process.
diff --git a/content/public/browser/render_view_host_delegate.h b/content/public/browser/render_view_host_delegate.h
index dd36549..61f2329 100644
--- a/content/public/browser/render_view_host_delegate.h
+++ b/content/public/browser/render_view_host_delegate.h
@@ -62,7 +62,7 @@ struct RendererPreferences;
 //  of the RenderViewHost.
 //
 //  This interface currently encompasses every type of message that was
-//  previously being sent by TabContents itself. Some of these notifications
+//  previously being sent by WebContents itself. Some of these notifications
 //  may not be relevant to all users of RenderViewHost and we should consider
 //  exposing a more generic Send function on RenderViewHost and a response
 //  listener here to serve that need.
@@ -158,8 +158,8 @@ class CONTENT_EXPORT RenderViewHostDelegate : public IPC::Channel::Listener {
   };
 
   // RendererManagerment -------------------------------------------------------
-  // Functions for managing switching of Renderers. For TabContents, this is
-  // implemented by the RenderViewHostManager
+  // Functions for managing switching of Renderers. For WebContents, this is
+  // implemented by the RenderViewHostManager.
 
   class CONTENT_EXPORT RendererManagement {
    public:
@@ -198,8 +198,8 @@ class CONTENT_EXPORT RenderViewHostDelegate : public IPC::Channel::Listener {
   // Gets the URL that is currently being displayed, if there is one.
   virtual const GURL& GetURL() const;
 
-  // Return this object cast to a TabContents, if it is one. If the object is
-  // not a TabContents, returns NULL. DEPRECATED: Be sure to include brettw or
+  // Return this object cast to a WebContents, if it is one. If the object is
+  // not a WebContents, returns NULL. DEPRECATED: Be sure to include brettw or
   // jam as reviewers before you use this method. http://crbug.com/82582
   virtual content::WebContents* GetAsWebContents();
 
diff --git a/content/public/browser/render_widget_host.h b/content/public/browser/render_widget_host.h
index a3ca330..648e2a2 100644
--- a/content/public/browser/render_widget_host.h
+++ b/content/public/browser/render_widget_host.h
@@ -48,44 +48,36 @@ class RenderWidgetHostView;
 // There are two situations in which this object, a RenderWidgetHost, can be
 // instantiated:
 //
-// 1. By a TabContents as the communication conduit for a rendered web page.
-//    The TabContents instantiates a derived class: RenderViewHost.
-// 2. By a TabContents as the communication conduit for a select widget. The
-//    TabContents instantiates the RenderWidgetHost directly.
+// 1. By a WebContents as the communication conduit for a rendered web page.
+//    The WebContents instantiates a derived class: RenderViewHost.
+// 2. By a WebContents as the communication conduit for a select widget. The
+//    WebContents instantiates the RenderWidgetHost directly.
 //
-// For every TabContents there are several objects in play that need to be
+// For every WebContents there are several objects in play that need to be
 // properly destroyed or cleaned up when certain events occur.
 //
-// - TabContents - the TabContents itself, and its associated HWND.
+// - WebContents - the WebContents itself, and its associated HWND.
 // - RenderViewHost - representing the communication conduit with the child
 //   process.
 // - RenderWidgetHostView - the view of the web page content, message handler,
 //   and plugin root.
 //
-// Normally, the TabContents contains a child RenderWidgetHostView that renders
+// Normally, the WebContents contains a child RenderWidgetHostView that renders
 // the contents of the loaded page. It has a WS_CLIPCHILDREN style so that it
 // does no painting of its own.
 //
 // The lifetime of the RenderWidgetHostView is tied to the render process. If
 // the render process dies, the RenderWidgetHostView goes away and all
-// references to it must become NULL. If the TabContents finds itself without a
-// RenderWidgetHostView, it paints Sad Tab instead.
+// references to it must become NULL.
 //
 // RenderViewHost (a RenderWidgetHost subclass) is the conduit used to
-// communicate with the RenderView and is owned by the TabContents. If the
+// communicate with the RenderView and is owned by the WebContents. If the
 // render process crashes, the RenderViewHost remains and restarts the render
 // process if needed to continue navigation.
 //
-// The TabContents is itself owned by the NavigationController in which it
-// resides.
-//
 // Some examples of how shutdown works:
 //
-// When a tab is closed (either by the user, the web page calling window.close,
-// etc) the TabStrip destroys the associated NavigationController, which calls
-// Destroy on each TabContents it owns.
-//
-// For a TabContents, its Destroy method tells the RenderViewHost to
+// For a WebContents, its Destroy method tells the RenderViewHost to
 // shut down the render process and die.
 //
 // When the render process is destroyed it destroys the View: the
@@ -93,19 +85,19 @@ class RenderWidgetHostView;
 //
 // For select popups, the situation is a little different. The RenderWidgetHost
 // associated with the select popup owns the view and itself (is responsible
-// for destroying itself when the view is closed). The TabContents's only
+// for destroying itself when the view is closed). The WebContents's only
 // responsibility is to select popups is to create them when it is told to. When
 // the View is destroyed via an IPC message (for when WebCore destroys the
 // popup, e.g. if the user selects one of the options), or because
 // WM_CANCELMODE is received by the view, the View schedules the destruction of
-// the render process. However in this case since there's no TabContents
+// the render process. However in this case since there's no WebContents
 // container, when the render process is destroyed, the RenderWidgetHost just
 // deletes itself, which is safe because no one else should have any references
-// to it (the TabContents does not).
+// to it (the WebContents does not).
 //
 // It should be noted that the RenderViewHost, not the RenderWidgetHost,
 // handles IPC messages relating to the render process going away, since the
-// way a RenderViewHost (TabContents) handles the process dying is different to
+// way a RenderViewHost (WebContents) handles the process dying is different to
 // the way a select popup does. As such the RenderWidgetHostView handles these
 // messages for select popups. This placement is more out of convenience than
 // anything else. When the view is live, these messages are forwarded to it by
diff --git a/content/public/browser/site_instance.h b/content/public/browser/site_instance.h
index 37c6201..66081ec 100644
--- a/content/public/browser/site_instance.h
+++ b/content/public/browser/site_instance.h
@@ -27,8 +27,8 @@ class RenderProcessHost;
 // to the other).  We represent instances using the BrowsingInstance class.
 //
 // In --process-per-tab, one SiteInstance is created for each tab (i.e., in the
-// TabContents constructor), unless the tab is created by script (i.e., in
-// TabContents::CreateNewView).  This corresponds to one process per
+// WebContents constructor), unless the tab is created by script (i.e., in
+// WebContents::CreateNewView).  This corresponds to one process per
 // BrowsingInstance.
 //
 // In process-per-site-instance (the current default process model),
@@ -42,7 +42,7 @@ class RenderProcessHost;
 // throughout the entire browser context.  This ensures that only one process
 // will be dedicated to each site.
 //
-// Each NavigationEntry for a TabContents points to the SiteInstance that
+// Each NavigationEntry for a WebContents points to the SiteInstance that
 // rendered it.  Each RenderViewHost also points to the SiteInstance that it is
 // associated with.  A SiteInstance keeps track of the number of these
 // references and deletes itself when the count goes to zero.  This means that
diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
index bf401c8c..0c0e86f 100644
--- a/content/public/browser/web_contents.h
+++ b/content/public/browser/web_contents.h
@@ -127,15 +127,14 @@ class WebContents : public PageNavigator {
   virtual const string16& GetTitle() const = 0;
 
   // The max page ID for any page that the current SiteInstance has loaded in
-  // this TabContents.  Page IDs are specific to a given SiteInstance and
-  // TabContents, corresponding to a specific RenderView in the renderer.
+  // this WebContents.  Page IDs are specific to a given SiteInstance and
+  // WebContents, corresponding to a specific RenderView in the renderer.
   // Page IDs increase with each new page that is loaded by a tab.
   virtual int32 GetMaxPageID() = 0;
 
   // The max page ID for any page that the given SiteInstance has loaded in
-  // this TabContents.
-  virtual int32 GetMaxPageIDForSiteInstance(
-      SiteInstance* site_instance) = 0;
+  // this WebContents.
+  virtual int32 GetMaxPageIDForSiteInstance(SiteInstance* site_instance) = 0;
 
   // Returns the SiteInstance associated with the current page.
   virtual SiteInstance* GetSiteInstance() const = 0;
@@ -227,14 +226,14 @@ class WebContents : public PageNavigator {
   // TODO(brettw): Most of these should be removed and the caller should call
   // the view directly.
 
-  // Returns the actual window that is focused when this TabContents is shown.
+  // Returns the actual window that is focused when this WebContents is shown.
   virtual gfx::NativeView GetContentNativeView() const = 0;
 
-  // Returns the NativeView associated with this TabContents. Outside of
+  // Returns the NativeView associated with this WebContents. Outside of
   // automation in the context of the UI, this is required to be implemented.
   virtual gfx::NativeView GetNativeView() const = 0;
 
-  // Returns the bounds of this TabContents in the screen coordinate system.
+  // Returns the bounds of this WebContents in the screen coordinate system.
   virtual void GetContainerBounds(gfx::Rect* out) const = 0;
 
   // Makes the tab the focused window.
@@ -282,7 +281,7 @@ class WebContents : public PageNavigator {
   // Returns the contents MIME type after a navigation.
   virtual const std::string& GetContentsMimeType() const = 0;
 
-  // Returns true if this TabContents will notify about disconnection.
+  // Returns true if this WebContents will notify about disconnection.
   virtual bool WillNotifyDisconnection() const = 0;
 
   // Override the encoding and reload the page by sending down
@@ -300,7 +299,7 @@ class WebContents : public PageNavigator {
   virtual content::RendererPreferences* GetMutableRendererPrefs() = 0;
 
   // Set the time when we started to create the new tab page.  This time is
-  // from before we created this TabContents.
+  // from before we created this WebContents.
   virtual void SetNewTabStartTime(const base::TimeTicks& time) = 0;
   virtual base::TimeTicks GetNewTabStartTime() const = 0;
 
diff --git a/content/public/common/page_type.h b/content/public/common/page_type.h
index d899bd1..54b7ac6 100644
--- a/content/public/common/page_type.h
+++ b/content/public/common/page_type.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -9,7 +9,7 @@
 namespace content {
 
 // The type of the page an entry corresponds to.  Used by chrome_frame and the
-// automation layer to detect the state of a TabContents.
+// automation layer to detect the state of a WebContents.
 enum PageType {
   PAGE_TYPE_NORMAL = 0,
   PAGE_TYPE_ERROR,
diff --git a/content/renderer/dom_automation_controller.h b/content/renderer/dom_automation_controller.h
index f1b06f4..9dabb79 100644
--- a/content/renderer/dom_automation_controller.h
+++ b/content/renderer/dom_automation_controller.h
@@ -41,7 +41,7 @@
       |                 |-------->|DAController|<----|
       |                                 |
       |                                 |(5)
-      |---------|TabContents|<----------|
+      |-------|WebContentsImpl|<--------|
 
 
    Legends:
diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h
index df6bf55..1c1219e 100644
--- a/content/renderer/render_thread_impl.h
+++ b/content/renderer/render_thread_impl.h
@@ -66,7 +66,7 @@ class Extension;
 // instances live.  The RenderThread supports an API that is used by its
 // consumer to talk indirectly to the RenderViews and supporting objects.
 // Likewise, it provides an API for the RenderViews to talk back to the main
-// process (i.e., their corresponding TabContents).
+// process (i.e., their corresponding WebContentsImpl).
 //
 // Most of the communication occurs in the form of IPC messages.  They are
 // routed to the RenderThread according to the routing IDs of the messages.
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 44b0656..48765f4 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -1268,7 +1268,7 @@ void RenderViewImpl::UpdateURL(WebFrame* frame) {
 
     // Reset the zoom limits in case a plugin had changed them previously. This
     // will also call us back which will cause us to send a message to
-    // update TabContents.
+    // update WebContentsImpl.
     webview()->zoomLimitsChanged(
         WebView::zoomFactorToZoomLevel(content::kMinimumZoomFactor),
         WebView::zoomFactorToZoomLevel(content::kMaximumZoomFactor));
diff --git a/content/test/test_renderer_host.cc b/content/test/test_renderer_host.cc
index ea9dce7..c690cf4 100644
--- a/content/test/test_renderer_host.cc
+++ b/content/test/test_renderer_host.cc
@@ -175,7 +175,7 @@ WebContents* RenderViewHostTestHarness::CreateTestWebContents() {
   if (!browser_context_.get())
     browser_context_.reset(new TestBrowserContext());
 
-  // This will be deleted when the TabContents goes away.
+  // This will be deleted when the WebContentsImpl goes away.
   SiteInstance* instance = SiteInstance::Create(browser_context_.get());
 
   return new TestWebContents(browser_context_.get(), instance);
@@ -213,7 +213,7 @@ void RenderViewHostTestHarness::TearDown() {
   root_window_.reset();
 #endif
 
-  // Make sure that we flush any messages related to TabContents destruction
+  // Make sure that we flush any messages related to WebContentsImpl destruction
   // before we destroy the browser context.
   MessageLoop::current()->RunAllPending();
 
diff --git a/content/test/test_renderer_host.h b/content/test/test_renderer_host.h
index bab7ef6..91b0844 100644
--- a/content/test/test_renderer_host.h
+++ b/content/test/test_renderer_host.h
@@ -46,7 +46,7 @@ class RenderViewHostTester {
   // outside of content.
   static void EnableAccessibilityUpdatedNotifications(RenderViewHost* host);
 
-  // If the given TabContents has a pending RVH, returns it, otherwise NULL.
+  // If the given WebContentsImpl has a pending RVH, returns it, otherwise NULL.
   static RenderViewHost* GetPendingForController(
       NavigationController* controller);