Prevent reentrant CompleteDrag when changing display configuration

BUG=315395
TEST=interactive_ui_tests --gtest_filter=*CancelDragTabToWindowIn*Display

Review URL: https://codereview.chromium.org/61443002

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

ash/wm/toplevel_window_event_handler.cc

@@ -376,10 +376,7 @@ void ToplevelWindowEventHandler::EndMoveLoop() {
     return;
 
   in_move_loop_ = false;
-  if (window_resizer_) {
-    window_resizer_->resizer()->RevertDrag();
-    window_resizer_.reset();
-  }
+  CompleteDrag(DRAG_REVERT, 0);
   quit_closure_.Run();
 }
 
@@ -387,9 +384,8 @@ void ToplevelWindowEventHandler::OnDisplayConfigurationChanging() {
   if (in_move_loop_) {
     move_cancelled_ = true;
     EndMoveLoop();
-  } else if (window_resizer_) {
-    window_resizer_->resizer()->RevertDrag();
-    window_resizer_.reset();
+  } else {
+    CompleteDrag(DRAG_REVERT, 0);
   }
 }