Move chromeos_mount.cc from libcros to Chrome tree

chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc

Index: chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc
diff --git a/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc b/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc
index ec3ec6bbb586bc7d7f95ce3cdc03cb165b8f903e..c21ac7158fded155e980dea8eea999e7a1eb9207 100644
--- a/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc
@@ -12,6 +12,7 @@
 #include "base/task.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
+#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/browser/chromeos/system/statistics_provider.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
@@ -126,7 +127,7 @@ WebUIHandler::WebUIHandler(TabContents* contents)
       state_machine_(NULL),
       observing_burn_lib_(false),
       working_(false) {
-  chromeos::CrosLibrary::Get()->GetMountLibrary()->AddObserver(this);
+  chromeos::DBusThreadManager::Get()->GetCrosDisksClient()->AddObserver(this);
   chromeos::CrosLibrary::Get()->GetNetworkLibrary()->
       AddNetworkManagerObserver(this);
   burn_manager_ = BurnManager::GetInstance();
@@ -135,7 +136,8 @@ WebUIHandler::WebUIHandler(TabContents* contents)
 }
 
 WebUIHandler::~WebUIHandler() {
-  chromeos::CrosLibrary::Get()->GetMountLibrary()->RemoveObserver(this);
+  chromeos::DBusThreadManager::Get()->GetCrosDisksClient()->
+      RemoveObserver(this);
   chromeos::CrosLibrary::Get()->GetBurnLibrary()->RemoveObserver(this);
   chromeos::CrosLibrary::Get()->GetNetworkLibrary()->
       RemoveNetworkManagerObserver(this);
@@ -160,8 +162,8 @@ void WebUIHandler::RegisterMessages() {
                  base::Unretained(this)));
 }
 
-void WebUIHandler::DiskChanged(chromeos::MountLibraryEventType event,
-                                   const chromeos::MountLibrary::Disk* disk) {
+void WebUIHandler::DiskChanged(chromeos::CrosDisksClientEventType event,
+                               const chromeos::CrosDisksClient::Disk* disk) {
   if (!disk->is_parent() || disk->on_boot_device())
     return;
   if (event == chromeos::MOUNT_DISK_ADDED) {
@@ -180,8 +182,8 @@ void WebUIHandler::DiskChanged(chromeos::MountLibraryEventType event,
 }
 
 void WebUIHandler::BurnProgressUpdated(chromeos::BurnLibrary* object,
-                                           chromeos::BurnEvent evt,
-                                           const ImageBurnStatus& status) {
+                                       chromeos::BurnEvent evt,
+                                       const ImageBurnStatus& status) {
   switch (evt) {
     case(chromeos::BURN_SUCCESS):
       FinalizeBurn();
@@ -278,7 +280,7 @@ void WebUIHandler::OnError(int error_message_id) {
   working_ = false;
 }
 
-void WebUIHandler::CreateDiskValue(const chromeos::MountLibrary::Disk& disk,
+void WebUIHandler::CreateDiskValue(const chromeos::CrosDisksClient::Disk& disk,
     DictionaryValue* disk_value) {
   string16 label = ASCIIToUTF16(disk.drive_label());
   base::i18n::AdjustStringForLocaleDirection(&label);
@@ -288,14 +290,14 @@ void WebUIHandler::CreateDiskValue(const chromeos::MountLibrary::Disk& disk,
 }
 
 void WebUIHandler::HandleGetDevices(const ListValue* args) {
-  chromeos::MountLibrary* mount_lib =
-      chromeos::CrosLibrary::Get()->GetMountLibrary();
-  const chromeos::MountLibrary::DiskMap& disks = mount_lib->disks();
+  chromeos::CrosDisksClient* mount_lib =
+      chromeos::DBusThreadManager::Get()->GetCrosDisksClient();
+  const chromeos::CrosDisksClient::DiskMap& disks = mount_lib->disks();
   ListValue results_value;
-  for (chromeos::MountLibrary::DiskMap::const_iterator iter =  disks.begin();
+  for (chromeos::CrosDisksClient::DiskMap::const_iterator iter =  disks.begin();
        iter != disks.end();
        ++iter) {
-    chromeos::MountLibrary::Disk* disk = iter->second;
+    chromeos::CrosDisksClient::Disk* disk = iter->second;
     if (disk->is_parent() && !disk->on_boot_device()) {
       DictionaryValue* disk_value = new DictionaryValue();
       CreateDiskValue(*disk, disk_value);
@@ -613,9 +615,9 @@ void WebUIHandler::ExtractTargetedDevicePath(
 }
 
 int64 WebUIHandler::GetDeviceSize(const std::string& device_path) {
-  chromeos::MountLibrary* mount_lib =
-      chromeos::CrosLibrary::Get()->GetMountLibrary();
-  const chromeos::MountLibrary::DiskMap& disks = mount_lib->disks();
+  chromeos::CrosDisksClient* mount_lib =
+      chromeos::DBusThreadManager::Get()->GetCrosDisksClient();
+  const chromeos::CrosDisksClient::DiskMap& disks = mount_lib->disks();
   return disks.find(device_path)->second->total_size();
 }