Adding support for mount point different from removable devices to MountLibrary

chrome/browser/chromeos/cros/mock_mount_library.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/cros/mock_mount_library.h"
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "content/browser/browser_thread.h"
@@ skipping 22 matching lines @@
   observers_.RemoveObserver(observer);
 }
 
 MockMountLibrary::MockMountLibrary() {
   ON_CALL(*this, AddObserver(_))
       .WillByDefault(Invoke(this, &MockMountLibrary::AddObserverInternal));
   ON_CALL(*this, RemoveObserver(_))
       .WillByDefault(Invoke(this, &MockMountLibrary::RemoveObserverInternal));
   ON_CALL(*this, disks())
       .WillByDefault(Invoke(this, &MockMountLibrary::disksInternal));
+  ON_CALL(*this, mount_points())
+      .WillByDefault(Invoke(this, &MockMountLibrary::mountPointsInternal));
 }
 
 MockMountLibrary::~MockMountLibrary() {
 
 }
 
 void MockMountLibrary::FireDeviceInsertEvents() {
 
   scoped_ptr<MountLibrary::Disk> disk1(new MountLibrary::Disk(
       std::string(kTestDevicePath),
@@ skipping 68 matching lines @@
 
 void MockMountLibrary::SetupDefaultReplies() {
   EXPECT_CALL(*this, AddObserver(_))
       .Times(AnyNumber());
   EXPECT_CALL(*this, RemoveObserver(_))
       .Times(AnyNumber());
   EXPECT_CALL(*this, disks())
       .WillRepeatedly(ReturnRef(disks_));
   EXPECT_CALL(*this, RequestMountInfoRefresh())
       .Times(AnyNumber());
-  EXPECT_CALL(*this, MountPath(_))
+  EXPECT_CALL(*this, MountPath(_, _, _))
       .Times(AnyNumber());
   EXPECT_CALL(*this, UnmountPath(_))
       .Times(AnyNumber());
   EXPECT_CALL(*this, UnmountDeviceRecursive(_, _, _))
       .Times(AnyNumber());
 }
 
 void MockMountLibrary::UpdateDiskChanged(MountLibraryEventType evt,
                                          const MountLibrary::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) {
   // Make sure we run on UI thread.
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   FOR_EACH_OBSERVER(Observer, observers_, DeviceChanged(evt, path));
 }
 
 }  // namespace chromeos