Revert "Disabled WorkspaceWindowResizerTest.Edge since it got broken by https://chromiumcodereview.…

ash/wm/workspace/frame_maximize_button.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 "ash/wm/workspace/frame_maximize_button.h"
 
 #include "ash/launcher/launcher.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/wm/maximize_bubble_controller.h"
@@ skipping 492 matching lines @@
   gfx::Point result(location);
   views::View::ConvertPointToScreen(this, &result);
   return result;
 }
 
 void FrameMaximizeButton::Snap(const SnapSizer& snap_sizer) {
   views::Widget* widget = frame_->GetWidget();
   switch (snap_type_) {
     case SNAP_LEFT:
     case SNAP_RIGHT: {
-      // Get the bounds in screen coordinates for restore purposes.
-      gfx::Rect restore = widget->GetWindowBoundsInScreen();
+      // Get the window coordinates on the screen for restore purposes.
+      gfx::Rect restore = widget->GetNativeWindow()->bounds();
       if (widget->IsMaximized()) {
         // In case of maximized we have a restore boundary.
         DCHECK(ash::GetRestoreBoundsInScreen(widget->GetNativeWindow()));
         // If it was maximized we need to recover the old restore set.
         restore = *ash::GetRestoreBoundsInScreen(widget->GetNativeWindow());
         // Set the restore size we want to restore to.
         ash::SetRestoreBoundsInScreen(widget->GetNativeWindow(),
                                       ScreenBoundsForType(snap_type_,
                                                           snap_sizer));
         widget->Restore();
       } else {
         // Others might also have set up a restore rectangle already. If so,
         // we should not overwrite the restore rectangle.
         bool restore_set =
             GetRestoreBoundsInScreen(widget->GetNativeWindow()) != NULL;
         widget->SetBounds(ScreenBoundsForType(snap_type_, snap_sizer));
         if (restore_set)
           break;
       }
       // Remember the widow's bounds for restoration.
       ash::SetRestoreBoundsInScreen(widget->GetNativeWindow(), restore);
+      }
       break;
-    }
     case SNAP_MAXIMIZE:
       widget->Maximize();
       break;
     case SNAP_MINIMIZE:
       widget->Minimize();
       break;
     case SNAP_RESTORE:
       widget->Restore();
       break;
     case SNAP_NONE:
@@ skipping 25 matching lines @@
     return FRAME_STATE_SNAP_LEFT;
   if (bounds.right() == screen.right())
     return FRAME_STATE_SNAP_RIGHT;
   // If we come here, it is likely caused by the fact that the
   // "VerticalResizeDoubleClick" stored a restore rectangle. In that case
   // we allow all maximize operations (and keep the restore rectangle).
   return FRAME_STATE_NONE;
 }
 
 }  // namespace ash