Revert 244210 "Include external touchscreen vid/pid in UMA hardw..."

trunk/src/chrome/browser/metrics/metrics_log.cc

Index: trunk/src/chrome/browser/metrics/metrics_log.cc
===================================================================
--- trunk/src/chrome/browser/metrics/metrics_log.cc	(revision 244377)
+++ trunk/src/chrome/browser/metrics/metrics_log.cc	(working copy)
@@ -50,7 +50,6 @@
 #include "device/bluetooth/bluetooth_adapter_factory.h"
 #include "device/bluetooth/bluetooth_device.h"
 #include "gpu/config/gpu_info.h"
-#include "ui/events/event_utils.h"
 #include "ui/gfx/screen.h"
 #include "url/gurl.h"
 
@@ -67,7 +66,6 @@
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/login/user_manager.h"
-#include "ui/events/x/touch_factory_x11.h"
 #endif
 
 using content::GpuDataManager;
@@ -382,19 +380,6 @@
   NOTREACHED();
   return PairedDevice::DEVICE_UNKNOWN;
 }
-
-void WriteExternalTouchscreensProto(SystemProfileProto::Hardware* hardware) {
-  std::set<std::pair<int, int> > touchscreen_ids =
-      ui::TouchFactory::GetInstance()->GetTouchscreenIds();
-  for (std::set<std::pair<int, int> >::iterator it = touchscreen_ids.begin();
-       it != touchscreen_ids.end();
-       ++it) {
-    SystemProfileProto::Hardware::TouchScreen* touchscreen =
-        hardware->add_external_touchscreen();
-    touchscreen->set_vendor_id(it->first);
-    touchscreen->set_product_id(it->second);
-  }
-}
 #endif  // defined(OS_CHROMEOS)
 
 // Round a timestamp measured in seconds since epoch to one with a granularity
@@ -816,9 +801,6 @@
     uma_proto()->add_perf_data()->Swap(&perf_data_proto);
 
   WriteBluetoothProto(hardware);
-  hardware->set_internal_display_supports_touch(
-      ui::InternalDisplaySupportsTouch());
-  WriteExternalTouchscreensProto(hardware);
   UpdateMultiProfileUserCount();
 #endif