SystemMonitor: Pull device type into the device id

chrome/browser/media_gallery/media_device_notifications_window_win_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 "chrome/browser/media_gallery/media_device_notifications_window_win.h"
 
 #include <dbt.h>
 
 #include <string>
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/scoped_temp_dir.h"
 #include "base/string_number_conversions.h"
 #include "base/system_monitor/system_monitor.h"
 #include "base/test/mock_devices_changed_observer.h"
+#include "chrome/browser/media_gallery/media_storage_util.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 using content::BrowserThread;
 
 LRESULT GetVolumeName(LPCWSTR drive,
                       LPWSTR volume_name,
                       unsigned int volume_name_length) {
   DCHECK(volume_name_length > wcslen(drive) + 2);
   *volume_name = 'V';
   wcscpy(volume_name + 1, drive);
   return TRUE;
 }
 
 }  // namespace
 
+namespace chrome {
+
 using chrome::MediaDeviceNotificationsWindowWin;
 using testing::_;
 
 class MediaDeviceNotificationsWindowWinTest : public testing::Test {
  public:
   MediaDeviceNotificationsWindowWinTest()
       : ui_thread_(BrowserThread::UI, &message_loop_),
         file_thread_(BrowserThread::FILE) { }
   virtual ~MediaDeviceNotificationsWindowWinTest() { }
 
@@ skipping 44 matching lines @@
   volume_broadcast.dbcv_flags = 0x0;
   {
     testing::InSequence sequence;
     for (std::vector<int>::const_iterator it = device_indices.begin();
          it != device_indices.end();
          ++it) {
       volume_broadcast.dbcv_unitmask |= 0x1 << *it;
       std::wstring drive(L"_:\\");
       drive[0] = 'A' + *it;
       FilePath::StringType name = L"V" + drive;
-      EXPECT_CALL(observer_,
-                  OnMediaDeviceAttached(base::IntToString(*it),
-                                        name,
-                                        base::SystemMonitor::TYPE_PATH,
-                                        drive))
+      std::string device_id = MediaStorageUtil::MakeDeviceId(
+          MediaStorageUtil::USB_MASS_STORAGE_WITH_DCIM, base::IntToString(*it));
+      EXPECT_CALL(observer_, OnMediaDeviceAttached(device_id, name, drive))
           .Times(0);
     }
   }
   window_->OnDeviceChange(DBT_DEVICEARRIVAL,
                           reinterpret_cast<DWORD>(&volume_broadcast));
   message_loop_.RunAllPending();
 }
 
 void MediaDeviceNotificationsWindowWinTest::DoDevicesDetachedTest(
     const std::vector<int>& device_indices) {
   DEV_BROADCAST_VOLUME volume_broadcast;
   volume_broadcast.dbcv_size = sizeof(volume_broadcast);
   volume_broadcast.dbcv_devicetype = DBT_DEVTYP_VOLUME;
   volume_broadcast.dbcv_unitmask = 0x0;
   volume_broadcast.dbcv_flags = 0x0;
   {
     testing::InSequence sequence;
     for (std::vector<int>::const_iterator it = device_indices.begin();
          it != device_indices.end();
          ++it) {
       volume_broadcast.dbcv_unitmask |= 0x1 << *it;
-      EXPECT_CALL(observer_, OnMediaDeviceDetached(base::IntToString(*it)))
-          .Times(0);
+      std::string device_id = MediaStorageUtil::MakeDeviceId(
+          MediaStorageUtil::USB_MASS_STORAGE_WITH_DCIM, base::IntToString(*it));
+      EXPECT_CALL(observer_, OnMediaDeviceDetached(device_id)).Times(0);
     }
   }
   window_->OnDeviceChange(DBT_DEVICEREMOVECOMPLETE,
                           reinterpret_cast<DWORD>(&volume_broadcast));
   message_loop_.RunAllPending();
 }
 
 TEST_F(MediaDeviceNotificationsWindowWinTest, RandomMessage) {
   window_->OnDeviceChange(DBT_DEVICEQUERYREMOVE, NULL);
   message_loop_.RunAllPending();
@@ skipping 57 matching lines @@
 
 TEST_F(MediaDeviceNotificationsWindowWinTest, DevicesDetachedAdjacentBits) {
   std::vector<int> device_indices;
   device_indices.push_back(0);
   device_indices.push_back(1);
   device_indices.push_back(2);
   device_indices.push_back(3);
 
   DoDevicesDetachedTest(device_indices);
 }
+
+}  // namespace chrome