TabContentsWrapper -> TabContents, part 35.

chrome/browser/ui/blocked_content/blocked_content_tab_helper.h

Index: chrome/browser/ui/blocked_content/blocked_content_tab_helper.h
diff --git a/chrome/browser/ui/blocked_content/blocked_content_tab_helper.h b/chrome/browser/ui/blocked_content/blocked_content_tab_helper.h
index 347d0deca4d67aaa2af601046a8d1c4bc3db3928..753ae2ec834701fe43f82c7902b5158cb97e9371 100644
--- a/chrome/browser/ui/blocked_content/blocked_content_tab_helper.h
+++ b/chrome/browser/ui/blocked_content/blocked_content_tab_helper.h
@@ -15,46 +15,43 @@
 class BlockedContentContainer;
 class BlockedContentTabHelperDelegate;
 class TabContents;
-typedef TabContents TabContentsWrapper;
 
 // Per-tab class to manage blocked popups.
 class BlockedContentTabHelper : public content::WebContentsObserver {
  public:
-  explicit BlockedContentTabHelper(TabContentsWrapper* tab_contents);
+  explicit BlockedContentTabHelper(TabContents* tab_contents);
   virtual ~BlockedContentTabHelper();
 
   BlockedContentTabHelperDelegate* delegate() const { return delegate_; }
   void set_delegate(BlockedContentTabHelperDelegate* d) { delegate_ = d; }
 
-  // Sets whether all TabContentsWrapper added by way of |AddNewContents| should
-  // be blocked. Transitioning from all blocked to not all blocked results in
-  // reevaluating any blocked TabContentsWrappers, which may result in
-  // unblocking some of the blocked TabContentsWrappers.
+  // Sets whether all TabContents added by way of |AddNewContents| should be
+  // blocked. Transitioning from all blocked to not all blocked results in
+  // reevaluating any blocked TabContentses, which may result in unblocking some
+  // of the blocked TabContentses.
   void SetAllContentsBlocked(bool value);
 
   bool all_contents_blocked() const { return all_contents_blocked_; }
 
   // Adds the incoming |new_contents| to the |blocked_contents_| container.
-  void AddTabContents(TabContentsWrapper* new_contents,
+  void AddTabContents(TabContents* new_contents,
                       WindowOpenDisposition disposition,
                       const gfx::Rect& initial_pos,
                       bool user_gesture);
 
   // Adds the incoming |new_contents| to the |blocked_contents_| container.
-  void AddPopup(TabContentsWrapper* new_contents,
+  void AddPopup(TabContents* new_contents,
                 const gfx::Rect& initial_pos,
                 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 blocked TabContentsWrappers.  |blocked_contents| must
-  // be non-NULL.
-  void GetBlockedContents(
-      std::vector<TabContentsWrapper*>* blocked_contents) const;
+  // Returns the blocked TabContentss.  |blocked_contents| must be non-NULL.
+  void GetBlockedContents(std::vector<TabContents*>* blocked_contents) const;
 
   // content::WebContentsObserver overrides:
   virtual void DidNavigateMainFrame(
@@ -67,17 +64,16 @@ class BlockedContentTabHelper : public content::WebContentsObserver {
 
   // Called to notify any observers that |contents| is entering or leaving
   // the blocked state.
-  void SendNotification(TabContentsWrapper* contents, bool blocked_state);
+  void SendNotification(TabContents* contents, bool blocked_state);
 
-  // Object that holds any blocked TabContentsWrapper spawned from this
-  // TabContentsWrapper.
+  // Object that holds any blocked TabContents spawned from this TabContents.
   scoped_ptr<BlockedContentContainer> blocked_contents_;
 
-  // Should we block all child TabContentsWrapper this attempts to spawn.
+  // Should we block all child TabContents this attempts to spawn.
   bool all_contents_blocked_;
 
-  // Owning TabContentsWrapper.
-  TabContentsWrapper* tab_contents_wrapper_;
+  // Owning TabContents.
+  TabContents* tab_contents_;
 
   // Delegate for notifying our owner (usually Browser) about stuff. Not owned
   // by us.