Revert of Use platform's device scale factor for cursor

ash/test/cursor_manager_test_api.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/test/cursor_manager_test_api.h"
 
 #include "ash/shell.h"
 #include "ash/test/shell_test_api.h"
 #include "ash/wm/ash_native_cursor_manager.h"
 #include "ash/wm/image_cursors.h"
@@ skipping 13 matching lines @@
 
 // TODO(tdanderson): CursorManagerTestApi may no longer be needed.
 ui::CursorSetType CursorManagerTestApi::GetCurrentCursorSet() const {
   return cursor_manager_->GetCursorSet();
 }
 
 gfx::NativeCursor CursorManagerTestApi::GetCurrentCursor() const {
   return cursor_manager_->GetCursor();
 }
 
-gfx::Display::Rotation
-CursorManagerTestApi::GetCurrentCursorRotation() const {
+gfx::Display CursorManagerTestApi::GetDisplay() const {
   return ShellTestApi(Shell::GetInstance()).ash_native_cursor_manager()->
-      image_cursors_->GetRotation();
-}
-
-float
-CursorManagerTestApi::GetCurrentCursorScale() const {
-  return ShellTestApi(Shell::GetInstance()).ash_native_cursor_manager()->
-      image_cursors_->GetScale();
+      image_cursors_->GetDisplay();
 }
 
 }  // namespace test
 }  // namespace ash