Added device types (bluetooth, usb, serio) to InputDeviceInfo.

chrome/browser/chromeos/device/input_service_proxy_browsertest.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 "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "chrome/browser/chromeos/device/input_service_proxy.h"
 #include "chrome/test/base/in_process_browser_test.h"
@@ skipping 65 matching lines @@
     run.Run();
 
     done_.Reset();
     wait_for_device_removal_ = false;
   }
 
  private:
   static bool Equals(const InputDeviceInfo& lhs, const InputDeviceInfo& rhs) {
     return lhs.id == rhs.id && lhs.name == rhs.name &&
            lhs.subsystem == rhs.subsystem &&
+           lhs.type == rhs.type &&
            lhs.is_accelerometer == rhs.is_accelerometer &&
            lhs.is_joystick == rhs.is_joystick && lhs.is_key == rhs.is_key &&
            lhs.is_keyboard == rhs.is_keyboard && lhs.is_mouse == rhs.is_mouse &&
            lhs.is_tablet == rhs.is_tablet &&
            lhs.is_touchpad == rhs.is_touchpad &&
            lhs.is_touchscreen == rhs.is_touchscreen;
   }
 
   InputDeviceInfo expected_info_;
   std::string expected_id_;
@@ skipping 58 matching lines @@
 IN_PROC_BROWSER_TEST_F(InputServiceProxyTest, Simple) {
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE, base::Bind(&InitInputService));
   InputServiceProxy proxy;
   TestObserver observer;
   proxy.AddObserver(&observer);
 
   InputDeviceInfo keyboard;
   keyboard.id = kKeyboardId;
   keyboard.subsystem = InputServiceLinux::InputDeviceInfo::SUBSYSTEM_INPUT;
+  keyboard.type = InputServiceLinux::InputDeviceInfo::TYPE_USB;
   keyboard.is_keyboard = true;
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE, base::Bind(&AddDevice, keyboard));
   observer.WaitForDeviceAddition(keyboard);
 
   InputDeviceInfo mouse;
   mouse.id = kMouseId;
   mouse.subsystem = InputServiceLinux::InputDeviceInfo::SUBSYSTEM_INPUT;
+  mouse.type = InputServiceLinux::InputDeviceInfo::TYPE_BLUETOOTH;
   mouse.is_mouse = true;
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE, base::Bind(&AddDevice, mouse));
   observer.WaitForDeviceAddition(mouse);
 
   {
     base::RunLoop run;
     proxy.GetDevices(base::Bind(&OnGetDevices, run.QuitClosure()));
     run.Run();
   }
@@ skipping 12 matching lines @@
   {
     base::RunLoop run;
     proxy.GetDeviceInfo(kMouseId, base::Bind(&OnGetMouse, run.QuitClosure()));
     run.Run();
   }
 
   proxy.RemoveObserver(&observer);
 }
 
 }  // namespace chromeos