Move chromeos_mount.cc from libcros to Chrome tree

chrome/browser/chromeos/dbus/mock_cros_disks_client.cc

Index: chrome/browser/chromeos/dbus/mock_cros_disks_client.cc
diff --git a/chrome/browser/chromeos/cros/mock_mount_library.cc b/chrome/browser/chromeos/dbus/mock_cros_disks_client.cc
similarity index 71%
rename from chrome/browser/chromeos/cros/mock_mount_library.cc
rename to chrome/browser/chromeos/dbus/mock_cros_disks_client.cc
index 87d03a6de918898175bbb49a9e45a8deea52c3e7..1ce79959a44dec09c19345b4a8fef6f832f5b31e 100644
--- a/chrome/browser/chromeos/cros/mock_mount_library.cc
+++ b/chrome/browser/chromeos/dbus/mock_cros_disks_client.cc
@@ -2,11 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/cros/mock_mount_library.h"
+#include "chrome/browser/chromeos/dbus/mock_cros_disks_client.h"
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace chromeos {
@@ -26,31 +25,31 @@ const char* kTestDeviceLabel = "A label";
 const char* kTestDriveLabel = "Another label";
 const char* kTestParentPath = "/this/is/my/parent";
 
-void MockMountLibrary::AddObserverInternal(MountLibrary::Observer* observer) {
+void MockCrosDisksClient::AddObserverInternal(
+    CrosDisksClient::Observer* observer) {
   observers_.AddObserver(observer);
 }
 
-void MockMountLibrary::RemoveObserverInternal(
-    MountLibrary::Observer* observer) {
+void MockCrosDisksClient::RemoveObserverInternal(
+    CrosDisksClient::Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
-MockMountLibrary::MockMountLibrary() {
+MockCrosDisksClient::MockCrosDisksClient() {
   ON_CALL(*this, AddObserver(_))
-      .WillByDefault(Invoke(this, &MockMountLibrary::AddObserverInternal));
+      .WillByDefault(Invoke(this, &MockCrosDisksClient::AddObserverInternal));
   ON_CALL(*this, RemoveObserver(_))
-      .WillByDefault(Invoke(this, &MockMountLibrary::RemoveObserverInternal));
+      .WillByDefault(Invoke(this,
+                            &MockCrosDisksClient::RemoveObserverInternal));
   ON_CALL(*this, disks())
-      .WillByDefault(Invoke(this, &MockMountLibrary::disksInternal));
+      .WillByDefault(Invoke(this, &MockCrosDisksClient::disksInternal));
 }
 
-MockMountLibrary::~MockMountLibrary() {
-
+MockCrosDisksClient::~MockCrosDisksClient() {
 }
 
-void MockMountLibrary::FireDeviceInsertEvents() {
-
-  scoped_ptr<MountLibrary::Disk> disk1(new MountLibrary::Disk(
+void MockCrosDisksClient::FireDeviceInsertEvents() {
+  scoped_ptr<CrosDisksClient::Disk> disk1(new CrosDisksClient::Disk(
       std::string(kTestDevicePath),
       std::string(),
       std::string(kTestSystemPath),
@@ -68,11 +67,11 @@ void MockMountLibrary::FireDeviceInsertEvents() {
       false));
 
   disks_.clear();
-  disks_.insert(std::pair<std::string, MountLibrary::Disk*>(
+  disks_.insert(std::pair<std::string, CrosDisksClient::Disk*>(
       std::string(kTestDevicePath), disk1.get()));
 
   // Device Added
-  chromeos::MountLibraryEventType evt;
+  chromeos::CrosDisksClientEventType evt;
   evt = chromeos::MOUNT_DEVICE_ADDED;
   UpdateDeviceChanged(evt, kTestSystemPath);
 
@@ -81,7 +80,7 @@ void MockMountLibrary::FireDeviceInsertEvents() {
   UpdateDiskChanged(evt, disk1.get());
 
   // Disk Changed
-  scoped_ptr<MountLibrary::Disk> disk2(new MountLibrary::Disk(
+  scoped_ptr<CrosDisksClient::Disk> disk2(new CrosDisksClient::Disk(
       std::string(kTestDevicePath),
       std::string(kTestMountPath),
       std::string(kTestSystemPath),
@@ -98,14 +97,14 @@ void MockMountLibrary::FireDeviceInsertEvents() {
       false,
       false));
   disks_.clear();
-  disks_.insert(std::pair<std::string, MountLibrary::Disk*>(
+  disks_.insert(std::pair<std::string, CrosDisksClient::Disk*>(
       std::string(kTestDevicePath), disk2.get()));
   evt = chromeos::MOUNT_DISK_CHANGED;
   UpdateDiskChanged(evt, disk2.get());
 }
 
-void MockMountLibrary::FireDeviceRemoveEvents() {
-  scoped_ptr<MountLibrary::Disk> disk(new MountLibrary::Disk(
+void MockCrosDisksClient::FireDeviceRemoveEvents() {
+  scoped_ptr<CrosDisksClient::Disk> disk(new CrosDisksClient::Disk(
       std::string(kTestDevicePath),
       std::string(kTestMountPath),
       std::string(kTestSystemPath),
@@ -122,12 +121,12 @@ void MockMountLibrary::FireDeviceRemoveEvents() {
       false,
       false));
   disks_.clear();
-  disks_.insert(std::pair<std::string, MountLibrary::Disk*>(
+  disks_.insert(std::pair<std::string, CrosDisksClient::Disk*>(
       std::string(kTestDevicePath), disk.get()));
   UpdateDiskChanged(chromeos::MOUNT_DISK_REMOVED, disk.get());
 }
 
-void MockMountLibrary::SetupDefaultReplies() {
+void MockCrosDisksClient::SetupDefaultReplies() {
   EXPECT_CALL(*this, AddObserver(_))
       .Times(AnyNumber());
   EXPECT_CALL(*this, RemoveObserver(_))
@@ -148,17 +147,16 @@ void MockMountLibrary::SetupDefaultReplies() {
       .Times(AnyNumber());
 }
 
-void MockMountLibrary::UpdateDiskChanged(MountLibraryEventType evt,
-                                         const MountLibrary::Disk* disk) {
+void MockCrosDisksClient::UpdateDiskChanged(CrosDisksClientEventType evt,
+                                            const CrosDisksClient::Disk* disk) {
   // Make sure we run on UI thread.
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   FOR_EACH_OBSERVER(Observer, observers_, DiskChanged(evt, disk));
 }
 
-
-void MockMountLibrary::UpdateDeviceChanged(MountLibraryEventType evt,
-                                           const std::string& path) {
+void MockCrosDisksClient::UpdateDeviceChanged(CrosDisksClientEventType evt,
+                                              const std::string& path) {
   // Make sure we run on UI thread.
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));