Change SystemMonitor::GetAttachedMediaDevices() to return a vector instead of a vector*.

BUG=none
TEST=none

Review URL: https://chromiumcodereview.appspot.com/10388244

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138645 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 28 insertions, 28 deletions

diff --git a/base/system_monitor/system_monitor.cc b/base/system_monitor/system_monitor.cc
index fa25f71..5815b92 100644
--- a/base/system_monitor/system_monitor.cc
+++ b/base/system_monitor/system_monitor.cc
@@ -100,13 +100,13 @@ void SystemMonitor::ProcessMediaDeviceDetached(const DeviceIdType& id) {
   NotifyMediaDeviceDetached(id);
 }
 
-std::vector<SystemMonitor::MediaDeviceInfo>*
+std::vector<SystemMonitor::MediaDeviceInfo>
 SystemMonitor::GetAttachedMediaDevices() const {
-  std::vector<MediaDeviceInfo>* results = new std::vector<MediaDeviceInfo>;
+  std::vector<MediaDeviceInfo> results;
   for (MediaDeviceMap::const_iterator it = media_device_map_.begin();
        it != media_device_map_.end();
        ++it) {
-    results->push_back(it->second);
+    results.push_back(it->second);
   }
   return results;
 }
diff --git a/base/system_monitor/system_monitor.h b/base/system_monitor/system_monitor.h
index d88ef09..7bff799 100644
--- a/base/system_monitor/system_monitor.h
+++ b/base/system_monitor/system_monitor.h
@@ -160,7 +160,7 @@ class BASE_EXPORT SystemMonitor {
   void ProcessMediaDeviceDetached(const DeviceIdType& id);
 
   // Returns information for attached media devices.
-  std::vector<MediaDeviceInfo>* GetAttachedMediaDevices() const;
+  std::vector<MediaDeviceInfo> GetAttachedMediaDevices() const;
 
   // Enters or leaves a period of time with a given |requirement|. If the
   // operation has multiple requirements, make sure to use a unique |reason| for
diff --git a/base/system_monitor/system_monitor_unittest.cc b/base/system_monitor/system_monitor_unittest.cc
index 7e7810a..26055e6 100644
--- a/base/system_monitor/system_monitor_unittest.cc
+++ b/base/system_monitor/system_monitor_unittest.cc
@@ -143,9 +143,9 @@ TEST_F(SystemMonitorTest, DeviceChangeNotifications) {
 }
 
 TEST_F(SystemMonitorTest, GetAttachedMediaDevicesEmpty) {
-  scoped_ptr<std::vector<SystemMonitor::MediaDeviceInfo> > devices;
-  devices.reset(system_monitor_->GetAttachedMediaDevices());
-  EXPECT_EQ(0U, devices->size());
+  std::vector<SystemMonitor::MediaDeviceInfo> devices =
+      system_monitor_->GetAttachedMediaDevices();
+  EXPECT_EQ(0U, devices.size());
 }
 
 TEST_F(SystemMonitorTest, GetAttachedMediaDevicesAttachDetach) {
@@ -156,12 +156,12 @@ TEST_F(SystemMonitorTest, GetAttachedMediaDevicesAttachDetach) {
                                              kDeviceName1,
                                              kDevicePath1);
   message_loop_.RunAllPending();
-  scoped_ptr<std::vector<SystemMonitor::MediaDeviceInfo> > devices;
-  devices.reset(system_monitor_->GetAttachedMediaDevices());
-  ASSERT_EQ(1U, devices->size());
-  EXPECT_EQ(kDeviceId1, (*devices)[0].a);
-  EXPECT_EQ(kDeviceName1, (*devices)[0].b);
-  EXPECT_EQ(kDevicePath1, (*devices)[0].c);
+  std::vector<SystemMonitor::MediaDeviceInfo> devices =
+      system_monitor_->GetAttachedMediaDevices();
+  ASSERT_EQ(1U, devices.size());
+  EXPECT_EQ(kDeviceId1, devices[0].a);
+  EXPECT_EQ(kDeviceName1, devices[0].b);
+  EXPECT_EQ(kDevicePath1, devices[0].c);
 
   const SystemMonitor::DeviceIdType kDeviceId2 = 44;
   const char kDeviceName2[] = "test2";
@@ -170,27 +170,27 @@ TEST_F(SystemMonitorTest, GetAttachedMediaDevicesAttachDetach) {
                                              kDeviceName2,
                                              kDevicePath2);
   message_loop_.RunAllPending();
-  devices.reset(system_monitor_->GetAttachedMediaDevices());
-  ASSERT_EQ(2U, devices->size());
-  EXPECT_EQ(kDeviceId1, (*devices)[0].a);
-  EXPECT_EQ(kDeviceName1, (*devices)[0].b);
-  EXPECT_EQ(kDevicePath1, (*devices)[0].c);
-  EXPECT_EQ(kDeviceId2, (*devices)[1].a);
-  EXPECT_EQ(kDeviceName2, (*devices)[1].b);
-  EXPECT_EQ(kDevicePath2, (*devices)[1].c);
+  devices = system_monitor_->GetAttachedMediaDevices();
+  ASSERT_EQ(2U, devices.size());
+  EXPECT_EQ(kDeviceId1, devices[0].a);
+  EXPECT_EQ(kDeviceName1, devices[0].b);
+  EXPECT_EQ(kDevicePath1, devices[0].c);
+  EXPECT_EQ(kDeviceId2, devices[1].a);
+  EXPECT_EQ(kDeviceName2, devices[1].b);
+  EXPECT_EQ(kDevicePath2, devices[1].c);
 
   system_monitor_->ProcessMediaDeviceDetached(kDeviceId1);
   message_loop_.RunAllPending();
-  devices.reset(system_monitor_->GetAttachedMediaDevices());
-  ASSERT_EQ(1U, devices->size());
-  EXPECT_EQ(kDeviceId2, (*devices)[0].a);
-  EXPECT_EQ(kDeviceName2, (*devices)[0].b);
-  EXPECT_EQ(kDevicePath2, (*devices)[0].c);
+  devices = system_monitor_->GetAttachedMediaDevices();
+  ASSERT_EQ(1U, devices.size());
+  EXPECT_EQ(kDeviceId2, devices[0].a);
+  EXPECT_EQ(kDeviceName2, devices[0].b);
+  EXPECT_EQ(kDevicePath2, devices[0].c);
 
   system_monitor_->ProcessMediaDeviceDetached(kDeviceId2);
   message_loop_.RunAllPending();
-  devices.reset(system_monitor_->GetAttachedMediaDevices());
-  EXPECT_EQ(0U, devices->size());
+  devices = system_monitor_->GetAttachedMediaDevices();
+  EXPECT_EQ(0U, devices.size());
 }
 
 TEST_F(SystemMonitorTest, PowerRequirements) {