TabContentsWrapper -> TabContents, part 48.

chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller_unittest.cc

Index: chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller_unittest.cc
diff --git a/chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller_unittest.cc b/chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller_unittest.cc
index 53cfd0821ec2dbddf29e30bbfa43dc3b76002d64..d66a05e343e551f9aa3ce270e54f6899b8ea2c23 100644
--- a/chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller_unittest.cc
+++ b/chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller_unittest.cc
@@ -9,7 +9,7 @@
 
 #include "ash/launcher/launcher_model.h"
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/tabs/test_tab_strip_model_delegate.h"
 #include "chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.h"
@@ -36,12 +36,12 @@ class AppIconLoaderImpl : public ChromeLauncherController::AppIconLoader {
 
   // Sets the id for the specified tab. The id is removed if Remove() is
   // invoked.
-  void SetAppID(TabContentsWrapper* tab, const std::string& id) {
+  void SetAppID(TabContents* tab, const std::string& id) {
     tab_id_map_[tab] = id;
   }
 
   // Returns true if there is an id registered for |tab|.
-  bool HasAppID(TabContentsWrapper* tab) const {
+  bool HasAppID(TabContents* tab) const {
     return tab_id_map_.find(tab) != tab_id_map_.end();
   }
 
@@ -54,7 +54,7 @@ class AppIconLoaderImpl : public ChromeLauncherController::AppIconLoader {
   }
 
   // AppIconLoader implementation:
-  virtual std::string GetAppID(TabContentsWrapper* tab) OVERRIDE {
+  virtual std::string GetAppID(TabContents* tab) OVERRIDE {
     return tab_id_map_.find(tab) != tab_id_map_.end() ? tab_id_map_[tab] :
         std::string();
   }
@@ -73,7 +73,7 @@ class AppIconLoaderImpl : public ChromeLauncherController::AppIconLoader {
   }
 
  private:
-  typedef std::map<TabContentsWrapper*, std::string> TabToStringMap;
+  typedef std::map<TabContents*, std::string> TabToStringMap;
 
   TabToStringMap tab_id_map_;
 
@@ -196,7 +196,7 @@ class BrowserLauncherItemControllerTest :
 TEST_F(BrowserLauncherItemControllerTest, TabbedSetup) {
   size_t initial_size = launcher_model_->items().size();
   {
-    TabContentsWrapper wrapper(CreateTestWebContents());
+    TabContents tab_contents(CreateTestWebContents());
     State state(this, std::string(),
                 BrowserLauncherItemController::TYPE_TABBED);
 
@@ -211,11 +211,11 @@ TEST_F(BrowserLauncherItemControllerTest, TabbedSetup) {
 
   // Do the same, but this time add the tab first.
   {
-    TabContentsWrapper wrapper(CreateTestWebContents());
+    TabContents tab_contents(CreateTestWebContents());
 
     TestTabStripModelDelegate tab_strip_delegate;
     TabStripModel tab_strip(&tab_strip_delegate, profile());
-    tab_strip.InsertTabContentsAt(0, &wrapper, TabStripModel::ADD_ACTIVE);
+    tab_strip.InsertTabContentsAt(0, &tab_contents, TabStripModel::ADD_ACTIVE);
     aura::Window window(NULL);
     window.Init(ui::LAYER_NOT_DRAWN);
     root_window()->AddChild(&window);
@@ -240,7 +240,7 @@ TEST_F(BrowserLauncherItemControllerTest, PanelItem) {
     aura::Window window(NULL);
     TestTabStripModelDelegate tab_strip_delegate;
     TabStripModel tab_strip(&tab_strip_delegate, profile());
-    TabContentsWrapper panel_tab(CreateTestWebContents());
+    TabContents panel_tab(CreateTestWebContents());
     app_icon_loader_->SetAppID(&panel_tab, "1");  // Panels are apps.
     tab_strip.InsertTabContentsAt(0, &panel_tab, TabStripModel::ADD_ACTIVE);
     BrowserLauncherItemController updater(
@@ -257,7 +257,7 @@ TEST_F(BrowserLauncherItemControllerTest, PanelItem) {
     aura::Window window(NULL);
     TestTabStripModelDelegate tab_strip_delegate;
     TabStripModel tab_strip(&tab_strip_delegate, profile());
-    TabContentsWrapper panel_tab(CreateTestWebContents());
+    TabContents panel_tab(CreateTestWebContents());
     app_icon_loader_->SetAppID(&panel_tab, "1");  // Panels are apps.
     tab_strip.InsertTabContentsAt(0, &panel_tab, TabStripModel::ADD_ACTIVE);
     BrowserLauncherItemController updater(
@@ -273,7 +273,7 @@ TEST_F(BrowserLauncherItemControllerTest, PanelItem) {
 // Verifies pinned apps are persisted and restored.
 TEST_F(BrowserLauncherItemControllerTest, PersistPinned) {
   size_t initial_size = launcher_model_->items().size();
-  TabContentsWrapper tab1(CreateTestWebContents());
+  TabContents tab1(CreateTestWebContents());
 
   app_icon_loader_->SetAppID(&tab1, "1");