Fix a mouse lock problem on Windows where in clicks outside the web page would also cause mouse lock to happen.

This fixes an issue with the mouse locking code on Windows where in if a page entered a mouse lock state and exited
it via the Esc key, subsequently clicking outside the page would cause the lock prompt to display again. This was because
RenderWidgetHostViewAura grabs capture on all platforms including Windows. On Windows the capture happens elsewhere in the
mouse handler. However when the mouse release comes in it is possible that we are already in the mouse locked state and
hence the capture is never released.

Fix is to release capture on all platforms.

BUG=526378
R=scheib
TBR=jam

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

Cr-Commit-Position: refs/heads/master@{#347122}
(cherry picked from commit c922b25f080de27ebe891adff689e9b56ffeaf12)

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

Cr-Commit-Position: refs/branch-heads/2490@{#170}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

1 files changed, 5 insertions, 3 deletions

diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index 7b73a6c..ff28163 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -1507,11 +1507,13 @@ void RenderWidgetHostViewAura::UnlockMouse() {
 
   mouse_locked_ = false;
 
-#if !defined(OS_WIN)
-  window_->ReleaseCapture();
-#else
+  if (window_->HasCapture())
+    window_->ReleaseCapture();
+
+#if defined(OS_WIN)
   ::ClipCursor(NULL);
 #endif
+
   window_->MoveCursorTo(unlocked_mouse_position_);
   aura::client::CursorClient* cursor_client =
       aura::client::GetCursorClient(root_window);