touch: Change how touch-screen capability is processed.

ash/touch/touch_transformer_controller_unittest.cc

 // Copyright 2014 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/touch/touch_transformer_controller.h"
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/events/devices/device_data_manager.h"
@@ skipping 14 matching lines @@
   // Create a default mode.
   std::vector<DisplayMode> default_modes(
       1, DisplayMode(bounds.size(), 60, false, true));
   info.SetDisplayModes(default_modes);
 
   return info;
 }
 
 ui::TouchscreenDevice CreateTouchscreenDevice(unsigned int id,
                                               const gfx::Size& size) {
-  return ui::TouchscreenDevice(id,
-                               ui::InputDeviceType::INPUT_DEVICE_EXTERNAL,
-                               std::string(),
-                               size);
+  return ui::TouchscreenDevice(id, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL,
+                               std::string(), size, 0);
 }
 
 }  //  namespace
 
 typedef test::AshTestBase TouchTransformerControllerTest;
 
 TEST_F(TouchTransformerControllerTest, TouchTransformerMirrorModeLetterboxing) {
   // The internal display has native resolution of 2560x1700, and in
   // mirror mode it is configured as 1920x1200. This is in letterboxing
   // mode.
@@ skipping 223 matching lines @@
       CreateTouchscreenDevice(5, gfx::Size(1001, 1001));
 
   TouchTransformerController* tt_controller =
       Shell::GetInstance()->touch_transformer_controller();
   // Default touchscreen position range is 1001x1001;
   EXPECT_EQ(sqrt((2560.0 * 1600.0) / (1001.0 * 1001.0)),
             tt_controller->GetTouchResolutionScale(display, touch_device));
 }
 
 }  // namespace ash