SystemMonitor: Pull device type into the device id

base/system_monitor/system_monitor_unittest.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 "base/system_monitor/system_monitor.h"
 
 #include "base/file_path.h"
 #include "base/message_loop.h"
 #include "base/test/mock_devices_changed_observer.h"
 #include "base/utf_string_conversions.h"
@@ skipping 104 matching lines @@
   for (int index = 0; index < kObservers; ++index) {
     system_monitor_->AddDevicesChangedObserver(&observers[index]);
 
     EXPECT_CALL(observers[index],
                 OnDevicesChanged(base::SystemMonitor::DEVTYPE_UNKNOWN))
         .Times(3)
         .InSequence(mock_sequencer[index]);
     EXPECT_CALL(observers[index],
                 OnMediaDeviceAttached(kDeviceId1,
                                       kDeviceName,
-                                      base::SystemMonitor::TYPE_PATH,
                                       testing::_))
         .InSequence(mock_sequencer[index]);
     EXPECT_CALL(observers[index], OnMediaDeviceDetached(kDeviceId1))
         .InSequence(mock_sequencer[index]);
     EXPECT_CALL(observers[index], OnMediaDeviceDetached(kDeviceId2))
         .Times(0).InSequence(mock_sequencer[index]);
   }
 
   system_monitor_->ProcessDevicesChanged(base::SystemMonitor::DEVTYPE_UNKNOWN);
   message_loop_.RunAllPending();
 
   system_monitor_->ProcessDevicesChanged(base::SystemMonitor::DEVTYPE_UNKNOWN);
   system_monitor_->ProcessDevicesChanged(base::SystemMonitor::DEVTYPE_UNKNOWN);
   message_loop_.RunAllPending();
 
   system_monitor_->ProcessMediaDeviceAttached(
       kDeviceId1,
       kDeviceName,
-      base::SystemMonitor::TYPE_PATH,
       FILE_PATH_LITERAL("path"));
   message_loop_.RunAllPending();
 
   system_monitor_->ProcessMediaDeviceDetached(kDeviceId1);
   system_monitor_->ProcessMediaDeviceDetached(kDeviceId2);
   message_loop_.RunAllPending();
 }
 
 TEST_F(SystemMonitorTest, GetAttachedMediaDevicesEmpty) {
   std::vector<SystemMonitor::MediaDeviceInfo> devices =
       system_monitor_->GetAttachedMediaDevices();
   EXPECT_EQ(0U, devices.size());
 }
 
 TEST_F(SystemMonitorTest, GetAttachedMediaDevicesAttachDetach) {
   const std::string kDeviceId1 = "42";
   const string16 kDeviceName1 = ASCIIToUTF16("test");
   const FilePath kDevicePath1(FILE_PATH_LITERAL("/testfoo"));
   system_monitor_->ProcessMediaDeviceAttached(kDeviceId1,
                                               kDeviceName1,
-                                              base::SystemMonitor::TYPE_PATH,
                                               kDevicePath1.value());
   message_loop_.RunAllPending();
   std::vector<SystemMonitor::MediaDeviceInfo> devices =
       system_monitor_->GetAttachedMediaDevices();
   ASSERT_EQ(1U, devices.size());
   EXPECT_EQ(kDeviceId1, devices[0].unique_id);
   EXPECT_EQ(kDeviceName1, devices[0].name);
-  EXPECT_EQ(base::SystemMonitor::TYPE_PATH, devices[0].type);
   EXPECT_EQ(kDevicePath1.value(), devices[0].location);
 
   const std::string kDeviceId2 = "44";
   const string16 kDeviceName2 = ASCIIToUTF16("test2");
   const FilePath kDevicePath2(FILE_PATH_LITERAL("/testbar"));
   system_monitor_->ProcessMediaDeviceAttached(kDeviceId2,
                                               kDeviceName2,
-                                              base::SystemMonitor::TYPE_PATH,
                                               kDevicePath2.value());
   message_loop_.RunAllPending();
   devices = system_monitor_->GetAttachedMediaDevices();
   ASSERT_EQ(2U, devices.size());
   EXPECT_EQ(kDeviceId1, devices[0].unique_id);
   EXPECT_EQ(kDeviceName1, devices[0].name);
-  EXPECT_EQ(base::SystemMonitor::TYPE_PATH, devices[0].type);
   EXPECT_EQ(kDevicePath1.value(), devices[0].location);
   EXPECT_EQ(kDeviceId2, devices[1].unique_id);
   EXPECT_EQ(kDeviceName2, devices[1].name);
-  EXPECT_EQ(base::SystemMonitor::TYPE_PATH, devices[1].type);
   EXPECT_EQ(kDevicePath2.value(), devices[1].location);
 
   system_monitor_->ProcessMediaDeviceDetached(kDeviceId1);
   message_loop_.RunAllPending();
   devices = system_monitor_->GetAttachedMediaDevices();
   ASSERT_EQ(1U, devices.size());
   EXPECT_EQ(kDeviceId2, devices[0].unique_id);
   EXPECT_EQ(kDeviceName2, devices[0].name);
-  EXPECT_EQ(base::SystemMonitor::TYPE_PATH, devices[0].type);
   EXPECT_EQ(kDevicePath2.value(), devices[0].location);
 
   system_monitor_->ProcessMediaDeviceDetached(kDeviceId2);
   message_loop_.RunAllPending();
   devices = system_monitor_->GetAttachedMediaDevices();
   EXPECT_EQ(0U, devices.size());
 }
 
 }  // namespace
 
 }  // namespace base