Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1743)

Unified Diff: chrome/browser/chromeos/extensions/file_browser_private_apitest.cc

Issue 10829160: Created a helper function "FindDiskBySourcePath" in DiskMountManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix browser test Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/extensions/file_browser_private_apitest.cc
diff --git a/chrome/browser/chromeos/extensions/file_browser_private_apitest.cc b/chrome/browser/chromeos/extensions/file_browser_private_apitest.cc
index 303dbcd4b34a4624c0adf28a378bddded4aaaf33..3df89e1d37fa95ee6e6a9f331477e84bfbc658ed 100644
--- a/chrome/browser/chromeos/extensions/file_browser_private_apitest.cc
+++ b/chrome/browser/chromeos/extensions/file_browser_private_apitest.cc
@@ -15,6 +15,7 @@
#include "webkit/fileapi/file_system_mount_point_provider.h"
using ::testing::_;
+using ::testing::AnyNumber;
using ::testing::ReturnRef;
using ::testing::StrEq;
using content::BrowserContext;
@@ -152,6 +153,11 @@ class ExtensionFileBrowserPrivateApiTest : public ExtensionApiTest {
chromeos::disks::DiskMountManager::InitializeForTesting(
disk_mount_manager_mock_);
disk_mount_manager_mock_->SetupDefaultReplies();
+
+ // OVERRIDE FindDiskBySourcePath mock function.
+ ON_CALL(*disk_mount_manager_mock_, FindDiskBySourcePath(_)).
+ WillByDefault(Invoke(
+ this, &ExtensionFileBrowserPrivateApiTest::FindVolumeBySourcePath));
}
// ExtensionApiTest override
@@ -210,6 +216,13 @@ class ExtensionFileBrowserPrivateApiTest : public ExtensionApiTest {
}
}
+ const DiskMountManager::Disk* FindVolumeBySourcePath(
+ const std::string& source_path) {
+ DiskMountManager::DiskMap::const_iterator volume_it =
+ volumes_.find(source_path);
+ return volume_it == volumes_.end() ? NULL : volume_it->second;
Ben Chan 2012/08/06 21:51:27 (volume_it == volumes_.end()) ?
kmadhusu 2012/08/06 21:55:48 sure. Done.
+ }
+
protected:
chromeos::disks::MockDiskMountManager* disk_mount_manager_mock_;
DiskMountManager::DiskMap volumes_;
« no previous file with comments | « chrome/browser/chromeos/extensions/file_browser_private_api.cc ('k') | chrome/browser/chromeos/imageburner/burn_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698