Switch from MountLibrary to CrosDisksLibrary

chrome/browser/chromeos/dbus/cros_disks_client.cc

 // Copyright (c) 2011 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/chromeos/dbus/cros_disks_client.h"
 
 #include "base/bind.h"
-#include "base/memory/scoped_vector.h"
+#include "base/stl_util.h"
 #include "chrome/browser/chromeos/system/runtime_environment.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_proxy.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 
 namespace {
 
@@ skipping 450 matching lines @@
 //   }
 // ]
 void DiskInfo::InitializeFromResponse(dbus::Response* response) {
   dbus::MessageReader response_reader(response);
   dbus::MessageReader array_reader(response);
   if (!response_reader.PopArray(&array_reader)) {
     LOG(ERROR) << "Invalid response: " << response->ToString();
     return;
   }
   // TODO(satorux): Rework this code using Protocol Buffers. crosbug.com/22626
-  ScopedVector<dbus::MessageReader> value_readers_owner;
-  std::map<std::string, dbus::MessageReader*> properties;
+  typedef std::map<std::string, dbus::MessageReader*> PropertiesMap;
+  PropertiesMap properties;
+  STLValueDeleter<PropertiesMap> properties_value_deleter(&properties);
   while (array_reader.HasMoreData()) {
-    // |value_readers_owner| is responsible to delete |value_reader|.
     dbus::MessageReader* value_reader = new dbus::MessageReader(response);
-    value_readers_owner.push_back(value_reader);
     dbus::MessageReader dict_entry_reader(response);
     std::string key;
     if (!array_reader.PopDictEntry(&dict_entry_reader) ||
         !dict_entry_reader.PopString(&key) ||
         !dict_entry_reader.PopVariant(value_reader)) {
       LOG(ERROR) << "Invalid response: " << response->ToString();
       return;
     }
     properties[key] = value_reader;
   }
@@ skipping 32 matching lines @@
 
 // static
 CrosDisksClient* CrosDisksClient::Create(dbus::Bus* bus) {
   if (system::runtime_environment::IsRunningOnChromeOS())
     return new CrosDisksClientImpl(bus);
   else
     return new CrosDisksClientStubImpl();
 }
 
 }  // namespace chromeos