Restores maximized browser before dragging a tab

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 "ash/wm/window_state.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 2132 matching lines @@
   // The bounds of the initial window should not have changed.
   EXPECT_TRUE(browser()->window()->IsMaximized());
 
   EXPECT_TRUE(GetTrackedByWorkspace(browser()));
   EXPECT_TRUE(GetTrackedByWorkspace(new_browser));
   // After this both windows should still be manageable.
   EXPECT_TRUE(IsWindowPositionManaged(browser()->window()->GetNativeWindow()));
   EXPECT_TRUE(IsWindowPositionManaged(
       new_browser->window()->GetNativeWindow()));
 
-  // The new window should be docked and not maximized if docking is allowed.
   ash::wm::WindowState* window_state =
       ash::wm::GetWindowState(new_browser->window()->GetNativeWindow());
+  // The new window should not be maximized because it gets docked or snapped.
+  EXPECT_FALSE(new_browser->window()->IsMaximized());
   if (docked_windows_enabled()) {
-    EXPECT_FALSE(new_browser->window()->IsMaximized());
+    // The new window should be docked and not snapped if docking is allowed.
     EXPECT_TRUE(window_state->IsDocked());
+    EXPECT_FALSE(window_state->IsSnapped());
   } else {
-    EXPECT_TRUE(new_browser->window()->IsMaximized());
+    // The new window should be snapped and not docked if docking is disabled.
     EXPECT_FALSE(window_state->IsDocked());
+    EXPECT_TRUE(window_state->IsSnapped());
   }
 }
 
 
 #endif
 
 #if defined(USE_ASH) && !defined(OS_WIN)  // TODO(win_ash)
 INSTANTIATE_TEST_CASE_P(TabDragging,
                         DetachToBrowserInSeparateDisplayTabDragControllerTest,
                         ::testing::Values("mouse", "touch"));
 INSTANTIATE_TEST_CASE_P(TabDragging,
                         DifferentDeviceScaleFactorDisplayTabDragControllerTest,
                         ::testing::Values("mouse"));
 INSTANTIATE_TEST_CASE_P(TabDragging,
                         DetachToBrowserTabDragControllerTest,
                         ::testing::Values("mouse", "touch"));
 INSTANTIATE_TEST_CASE_P(TabDragging,
                         DetachToDockedTabDragControllerTest,
                         ::testing::Values("mouse", "mouse docked"));
 INSTANTIATE_TEST_CASE_P(TabDragging,
                         DetachToBrowserTabDragControllerTestTouch,
                         ::testing::Values("touch", "touch docked"));
 #else
 INSTANTIATE_TEST_CASE_P(TabDragging,
                         DetachToBrowserTabDragControllerTest,
                         ::testing::Values("mouse"));
 #endif