Cleanup: Misc fixes to MediaDeviceNotifications.

chrome/browser/media_gallery/media_device_notifications_window_win_unittest.cc

Index: chrome/browser/media_gallery/media_device_notifications_window_win_unittest.cc
===================================================================
--- chrome/browser/media_gallery/media_device_notifications_window_win_unittest.cc	(revision 137269)
+++ chrome/browser/media_gallery/media_device_notifications_window_win_unittest.cc	(working copy)
@@ -2,17 +2,17 @@
 // 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"
 
@@ -39,8 +39,8 @@
     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_;
@@ -56,7 +56,7 @@
   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) {