Fiddle with destruction order of the dragged tab controller to ensure that there's still a TabStrip available for it.

B=1145714


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@708 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 3 insertions, 3 deletions

diff --git a/chrome/browser/tabs/tab_strip.cc b/chrome/browser/tabs/tab_strip.cc
index 2354f5e..f4b1447 100644
--- a/chrome/browser/tabs/tab_strip.cc
+++ b/chrome/browser/tabs/tab_strip.cc
@@ -467,6 +467,9 @@ TabStrip::~TabStrip() {
   // TODO(beng): (1031854) Restore this line once XPFrame/VistaFrame are dead.
   //model_->RemoveObserver(this);
 
+  // TODO(beng): remove this if it doesn't work to fix the TabSelectedAt bug.
+  drag_controller_.reset(NULL);
+
   // Stop any existing Loading Animation timer.
   MessageLoop::current()->timer_manager()->StopTimer(
       loading_animation_timer_.get());
diff --git a/chrome/test/automated_ui_tests/automated_ui_tests.cc b/chrome/test/automated_ui_tests/automated_ui_tests.cc
index 4d18706..d682d9e 100644
--- a/chrome/test/automated_ui_tests/automated_ui_tests.cc
+++ b/chrome/test/automated_ui_tests/automated_ui_tests.cc
@@ -209,7 +209,6 @@ void AutomatedUITest::RunAutomatedUITest() {
       if (DidCrash(true)) {
         LogCrashResult(WideToASCII(GetMostRecentCrashDump()), false);
         // Try and start up again.
-        Sleep(500);
         CloseBrowserAndServer();
         LaunchBrowserAndServer();
         if (DidCrash(true)) {
@@ -264,7 +263,6 @@ void AutomatedUITest::RunAutomatedUITest() {
       } else {
         // If there was a previous crash, just tear down without logging, so
         // that we know what the last command was before we crashed.
-        Sleep(500);
         CloseBrowserAndServer();
       }
 
@@ -368,7 +366,6 @@ bool AutomatedUITest::DoAction(const std::string & action) {
   } else if (LowerCaseEqualsASCII(action, "taskmanager")) {
     did_complete_action = OpenTaskManagerDialog();
   } else if (LowerCaseEqualsASCII(action, "teardown")) {
-    Sleep(500);
     CloseBrowserAndServer();
     did_complete_action = true;
   } else if (LowerCaseEqualsASCII(action, "testclearbrowserdata")) {