TabContentsWrapper -> TabContents, part 48.

chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc

 // 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.
 
 #include "chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/property_bag.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.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/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/tabs/tab.h"
 #include "chrome/browser/ui/views/tabs/tab_drag_controller.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/notification_details.h"
@@ skipping 302 matching lines @@
 
   // Should have canceled dragging.
   ASSERT_FALSE(tab_strip->IsDragSessionActive());
   ASSERT_FALSE(TabDragController::IsActive());
 
   EXPECT_EQ("1", IDString(browser()->tab_strip_model()));
 }
 
 namespace {
 
-void DeleteWhileDetachedStep2(TabContentsWrapper* tab) {
+void DeleteWhileDetachedStep2(TabContents* tab) {
   delete tab;
 }
 
 }  // namespace
 
 // Deletes a tab being dragged after dragging a tab so that a new window is
 // created.
 IN_PROC_BROWSER_TEST_F(DetachToBrowserTabDragControllerTest,
                        DeleteTabWhileDetached) {
   // Add another tab.
   AddTabAndResetBrowser(browser());
   TabStrip* tab_strip = GetTabStripForBrowser(browser());
 
   // Move to the first tab and drag it enough so that it detaches.
   gfx::Point tab_0_center(GetCenterInScreenCoordinates(tab_strip->tab_at(0)));
-  TabContentsWrapper* to_delete =
+  TabContents* to_delete =
       browser()->tab_strip_model()->GetTabContentsAt(0);
   ASSERT_TRUE(ui_test_utils::SendMouseMoveSync(tab_0_center));
   ASSERT_TRUE(ui_test_utils::SendMouseEventsSync(
                   ui_controls::LEFT, ui_controls::DOWN));
   ASSERT_TRUE(ui_controls::SendMouseMoveNotifyWhenDone(
       tab_0_center.x(), tab_0_center.y() + tab_strip->height() + 20,
       base::Bind(&DeleteWhileDetachedStep2, to_delete)));
   // Schedule observer to quit message loop when done dragging. This has to be
   // async so the message loop can run.
   QuitWhenNotDragging();
   MessageLoop::current()->Run();
 
   // Should not be dragging.
   ASSERT_FALSE(tab_strip->IsDragSessionActive());
   ASSERT_FALSE(TabDragController::IsActive());
 
   EXPECT_EQ("1", IDString(browser()->tab_strip_model()));
 }
 
 namespace {
 
-void DeleteSourceDetachedStep2(TabContentsWrapper* tab) {
+void DeleteSourceDetachedStep2(TabContents* tab) {
   // This ends up closing the source window.
   delete tab;
   // Cancel the drag.
   ui_controls::SendKeyPress(NULL, ui::VKEY_ESCAPE, false, false, false, false);
 }
 
 }  // namespace
 
 // Detaches a tab and while detached deletes a tab from the source so that the
 // source window closes then presses escape to cancel the drag.
 IN_PROC_BROWSER_TEST_F(DetachToBrowserTabDragControllerTest,
                        DeleteSourceDetached) {
   // Add another tab.
   AddTabAndResetBrowser(browser());
   TabStrip* tab_strip = GetTabStripForBrowser(browser());
 
   // Move to the first tab and drag it enough so that it detaches.
   gfx::Point tab_0_center(GetCenterInScreenCoordinates(tab_strip->tab_at(0)));
-  TabContentsWrapper* to_delete =
-      browser()->tab_strip_model()->GetTabContentsAt(1);
+  TabContents* to_delete = browser()->tab_strip_model()->GetTabContentsAt(1);
   ASSERT_TRUE(ui_test_utils::SendMouseMoveSync(tab_0_center));
   ASSERT_TRUE(ui_test_utils::SendMouseEventsSync(
                   ui_controls::LEFT, ui_controls::DOWN));
   ASSERT_TRUE(ui_controls::SendMouseMoveNotifyWhenDone(
       tab_0_center.x(), tab_0_center.y() + tab_strip->height() + 20,
       base::Bind(&DeleteSourceDetachedStep2, to_delete)));
   // Schedule observer to quit message loop when done dragging. This has to be
   // async so the message loop can run.
   QuitWhenNotDragging();
   MessageLoop::current()->Run();
@@ skipping 244 matching lines @@
 
   // Release the mouse, stopping the drag session.
   ASSERT_TRUE(ui_test_utils::SendMouseEventsSync(
                   ui_controls::LEFT, ui_controls::UP));
   ASSERT_FALSE(tab_strip2->IsDragSessionActive());
   ASSERT_FALSE(tab_strip->IsDragSessionActive());
   ASSERT_FALSE(TabDragController::IsActive());
   EXPECT_EQ("0 100", IDString(browser2->tab_strip_model()));
   EXPECT_EQ("1", IDString(browser()->tab_strip_model()));
 }