Cleanup: Misc fixes to MediaDeviceNotifications.

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 <windows.h>
+#include <dbt.h>
 
-#include <dbt.h>
 #include <string>
 #include <vector>
 
 #include "base/file_path.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/sys_string_conversions.h"
 #include "base/system_monitor/system_monitor.h"
 #include "base/test/mock_devices_changed_observer.h"
+#include "chrome/browser/media_gallery/media_device_notifications_window_win.h"

[vandebo (ex-Chrome), 2012/05/16 17:00:16]

nit: it looks like most files in base have this file first for unit tests.  The
style guide doesn't call it out one way or another.  Do you have specific
knowledge about this style item?

[Lei Zhang, 2012/05/16 19:02:55]

I remembered wrong. Reverted.

 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 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
 
 class MediaDeviceNotificationsWindowWinTest : public testing::Test {
  public:
   MediaDeviceNotificationsWindowWinTest() : window_(&GetVolumeName) { }
   virtual ~MediaDeviceNotificationsWindowWinTest() { }
 
  protected:
   virtual void SetUp() OVERRIDE {
     system_monitor_.AddDevicesChangedObserver(&observer_);
   }
 
-  void DoDevicesAttachedTest(const std::vector<int>& deviceIndices);
-  void DoDevicesDetachedTest(const std::vector<int>& deviceIndices);
+  void DoDevicesAttachedTest(const std::vector<int>& device_indices);
+  void DoDevicesDetachedTest(const std::vector<int>& device_indices);
 
   MessageLoop message_loop_;
   base::SystemMonitor system_monitor_;
   base::MockDevicesChangedObserver observer_;
   chrome::MediaDeviceNotificationsWindowWin window_;
 };
 
 void MediaDeviceNotificationsWindowWinTest::DoDevicesAttachedTest(
     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 sequnce;
+    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;
       std::string name("V");
       name.append(base::SysWideToUTF8(drive));
       EXPECT_CALL(observer_, OnMediaDeviceAttached(*it, name, FilePath(drive)));
     }
@@ skipping 87 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);
 }