TabContentsWrapper -> TabContents, part 2.

chrome/browser/ui/tab_contents/tab_contents_iterator.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_ITERATOR_H_
 #define CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_ITERATOR_H_
 #pragma once
 
 #include <set>
 
 #include "base/basictypes.h"
 #include "chrome/browser/ui/browser_list.h"
 
 class TabContents;
-typedef TabContents TabContentsWrapper;
 
 // Iterates through all web view hosts in all browser windows. Because the
 // renderers act asynchronously, getting a host through this interface does
 // not guarantee that the renderer is ready to go. Doing anything to affect
 // browser windows or tabs while iterating may cause incorrect behavior.
 //
 // Example:
 //   for (TabContentsIterator iterator; !iterator.done(); ++iterator) {
-//     TabContentsWrapper* cur = *iterator;
+//     TabContents* cur = *iterator;
 //     -or-
 //     iterator->operationOnTabContents();
 //     ...
 //   }
 class TabContentsIterator {
  public:
   TabContentsIterator();
 
   // Returns true if we are past the last Browser.
   bool done() const { return cur_ == NULL; }
 
   // Returns the Browser instance associated with the current
-  // TabContentsWrapper. Valid as long as !done()
+  // TabContents. Valid as long as !done()
   Browser* browser() const {
     if (browser_iterator_ != BrowserList::end())
       return *browser_iterator_;
     return NULL;
   }
 
-  // Returns the current TabContentsWrapper, valid as long as !Done()
-  TabContentsWrapper* operator->() const {
+  // Returns the current TabContents, valid as long as !Done()
+  TabContents* operator->() const {
     return cur_;
   }
-  TabContentsWrapper* operator*() const {
+  TabContents* operator*() const {
     return cur_;
   }
 
   // Incrementing operators, valid as long as !Done()
-  TabContentsWrapper* operator++() {  // ++preincrement
+  TabContents* operator++() {  // ++preincrement
     Advance();
     return cur_;
   }
-  TabContentsWrapper* operator++(int) {  // postincrement++
-    TabContentsWrapper* tmp = cur_;
+  TabContents* operator++(int) {  // postincrement++
+    TabContents* tmp = cur_;
     Advance();
     return tmp;
   }
 
  private:
   // Loads the next host into Cur. This is designed so that for the initial
   // call when browser_iterator_ points to the first browser and
   // web_view_index_ is -1, it will fill the first host.
   void Advance();
 
   // Iterator over all the Browser objects.
   BrowserList::const_iterator browser_iterator_;
 
   // tab index into the current Browser of the current web view
   int web_view_index_;
 
-  // iterator over the TabContentsWrappers doing background printing.
-  std::set<TabContentsWrapper*>::const_iterator bg_printing_iterator_;
+  // iterator over the TabContentss doing background printing.
+  std::set<TabContents*>::const_iterator bg_printing_iterator_;
 
-  // Current TabContentsWrapper, or NULL if we're at the end of the list. This
+  // Current TabContents, or NULL if we're at the end of the list. This
   // can be extracted given the browser iterator and index, but it's nice to
   // cache this since the caller may access the current host many times.
-  TabContentsWrapper* cur_;
+  TabContents* cur_;
 
   DISALLOW_COPY_AND_ASSIGN(TabContentsIterator);
 };
 
 #endif  // CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_ITERATOR_H_