Fix more cases of unreachable code on Windows

ash/display/mouse_cursor_event_filter.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/display/mouse_cursor_event_filter.h"
 
 #include <cmath>
 
 #include "ash/display/cursor_window_controller.h"
 #include "ash/display/display_controller.h"
@@ skipping 451 matching lines @@
                                                      aura::Window** dst_root) {
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
   *src_root = drag_source_root_ ? drag_source_root_
                                 : Shell::GetInstance()->GetPrimaryRootWindow();
   *dst_root = root_windows[0] == *src_root ? root_windows[1] : root_windows[0];
 }
 
 bool MouseCursorEventFilter::WarpMouseCursorIfNecessaryForTest(
     aura::Window* target_root,
     const gfx::Point& point_in_screen) {
-  if (enable_mouse_warp_in_native_coords) {
-    gfx::Point native = point_in_screen;
-    wm::ConvertPointFromScreen(target_root, &native);
-    target_root->GetHost()->ConvertPointToNativeScreen(&native);
-    return WarpMouseCursorInNativeCoords(native, point_in_screen);
-  } else {
+  if (!enable_mouse_warp_in_native_coords)
     return WarpMouseCursorInScreenCoords(target_root, point_in_screen);
-  }
-  return true;
+  gfx::Point native = point_in_screen;
+  wm::ConvertPointFromScreen(target_root, &native);
+  target_root->GetHost()->ConvertPointToNativeScreen(&native);
+  return WarpMouseCursorInNativeCoords(native, point_in_screen);
 }
 
 }  // namespace ash