Rename WindowTreeHost functions to indicate pixels/dips.

ash/display/unified_mouse_warp_controller_unittest.cc

 // Copyright 2015 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/unified_mouse_warp_controller.h"
 
 #include "ash/display/display_util.h"
 #include "ash/display/mirror_window_controller.h"
 #include "ash/display/mouse_cursor_event_filter.h"
 #include "ash/host/ash_window_tree_host.h"
@@ skipping 35 matching lines @@
         const gfx::Point& origin = info.bounds_in_native().origin();
         // Convert to mirroring host.
         point_in_unified_host->Offset(-origin.x(), -origin.y());
         *point_in_mirroring_host = *point_in_unified_host;
         // Convert from mirroring host to unified host.
         AshWindowTreeHost* ash_host =
             Shell::GetInstance()
                 ->window_tree_host_manager()
                 ->mirror_window_controller()
                 ->GetAshWindowTreeHostForDisplayId(info.id());
-        ash_host->AsWindowTreeHost()->ConvertPointFromHost(
-            point_in_unified_host);
+        ash_host->AsWindowTreeHost()->ConvertPixelsToDIP(point_in_unified_host);
         return true;
       }
     }
     return false;
   }
 
   bool TestIfMouseWarpsAt(const gfx::Point& point_in_native) {
     static_cast<UnifiedMouseWarpController*>(
         Shell::GetInstance()
             ->mouse_cursor_filter()
@@ skipping 12 matching lines @@
     GetEventGenerator().MoveMouseToWithNative(point_in_unified_host,
                                               point_in_mirroring_host);
 #else
     GetEventGenerator().MoveMouseToWithNative(point_in_unified_host,
                                               point_in_native);
 #endif
     aura::Window* root = Shell::GetPrimaryRootWindow();
     gfx::Point new_location_in_unified_host =
         aura::Env::GetInstance()->last_mouse_location();
     // Convert screen to the host.
-    root->GetHost()->ConvertPointToHost(&new_location_in_unified_host);
+    root->GetHost()->ConvertDIPToPixels(&new_location_in_unified_host);
 
     int new_index = display::FindDisplayIndexContainingPoint(
         display_manager()->software_mirroring_display_list(),
         new_location_in_unified_host);
     if (new_index < 0)
       return false;
     return orig_mirroring_display_id !=
            display_manager()->software_mirroring_display_list()[new_index].id();
   }
 
@@ skipping 152 matching lines @@
   EXPECT_TRUE(TestIfMouseWarpsAt(gfx::Point(600, 10)));
   EXPECT_EQ("249,5",  // moved to 498 by 2px, divided by 2 (dsf).
             aura::Env::GetInstance()->last_mouse_location().ToString());
   {
     SCOPED_TRACE("1x2 NO WARP");
     NoWarpTestBody();
   }
 }
 
 }  // namespace aura