TabContentsWrapper -> TabContents, part 35.

chrome/browser/ui/blocked_content/blocked_content_container.h

Index: chrome/browser/ui/blocked_content/blocked_content_container.h
diff --git a/chrome/browser/ui/blocked_content/blocked_content_container.h b/chrome/browser/ui/blocked_content/blocked_content_container.h
index 2945f954e2e7fa76b13e5d765fe856147413c921..2ff243f6789ef3fe214e3baf1c1f7fd93389b656 100644
--- a/chrome/browser/ui/blocked_content/blocked_content_container.h
+++ b/chrome/browser/ui/blocked_content/blocked_content_container.h
@@ -4,9 +4,9 @@
 
 // Defines the public interface for the blocked content (including popup)
 // notifications. This interface should only be used by the
-// BlockedContentTabHelper. Users and subclasses of WebContents/
-// TabContentsWrapper should use the appropriate methods on
-// BlockedContentTabHelper to access information about blocked content.
+// BlockedContentTabHelper. Users and subclasses of WebContents/TabContents
+// should use the appropriate methods on BlockedContentTabHelper to access
+// information about blocked content.
 
 #ifndef CHROME_BROWSER_UI_BLOCKED_CONTENT_BLOCKED_CONTENT_CONTAINER_H_
 #define CHROME_BROWSER_UI_BLOCKED_CONTENT_BLOCKED_CONTENT_CONTAINER_H_
@@ -19,40 +19,37 @@
 #include "content/public/browser/web_contents_delegate.h"
 
 class TabContents;
-typedef TabContents TabContentsWrapper;
 
-// Takes ownership of TabContentsWrappers that are unrequested popup windows.
+// Takes ownership of TabContentses that are unrequested popup windows.
 class BlockedContentContainer : public BlockedContentTabHelperDelegate,
                                 public content::WebContentsDelegate {
  public:
-  // Creates a container for a certain TabContentsWrapper:
-  explicit BlockedContentContainer(TabContentsWrapper* owner);
+  // Creates a container for a certain TabContents:
+  explicit BlockedContentContainer(TabContents* owner);
   virtual ~BlockedContentContainer();
 
-  // Adds a TabContentsWrapper to this container. |bounds| are the window bounds
-  // requested for the TabContentsWrapper.
-  void AddTabContents(TabContentsWrapper* tab_contents,
+  // Adds a TabContents to this container. |bounds| are the window bounds
+  // requested for the TabContents.
+  void AddTabContents(TabContents* tab_contents,
                       WindowOpenDisposition disposition,
                       const gfx::Rect& bounds,
                       bool user_gesture);
 
-  // Shows the blocked TabContentsWrapper |tab_contents|.
-  void LaunchForContents(TabContentsWrapper* tab_contents);
+  // Shows the blocked TabContents |tab_contents|.
+  void LaunchForContents(TabContents* tab_contents);
 
   // Returns the number of blocked contents.
   size_t GetBlockedContentsCount() const;
 
-  // Returns the contained TabContentsWrapper pointers.  |blocked_contents| must
+  // Returns the contained TabContents pointers.  |blocked_contents| must
   // be non-NULL.
-  void GetBlockedContents(
-      std::vector<TabContentsWrapper*>* blocked_contents) const;
+  void GetBlockedContents(std::vector<TabContents*>* blocked_contents) const;
 
   // Removes all blocked contents.
   void Clear();
 
   // Overridden from BlockedContentTabHelperDelegate:
-  virtual TabContentsWrapper* GetConstrainingContentsWrapper(
-      TabContentsWrapper* source) OVERRIDE;
+  virtual TabContents* GetConstrainingTabContents(TabContents* source) OVERRIDE;
 
   // Overridden from content::WebContentsDelegate:
 
@@ -91,9 +88,8 @@ class BlockedContentContainer : public BlockedContentTabHelperDelegate,
 
   typedef std::vector<BlockedContent> BlockedContents;
 
-  // The TabContentsWrapper that owns and constrains this
-  // BlockedContentContainer.
-  TabContentsWrapper* owner_;
+  // The TabContents that owns and constrains this BlockedContentContainer.
+  TabContents* owner_;
 
   // Information about all blocked contents.
   BlockedContents blocked_contents_;