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

Unified Diff: chrome/browser/extensions/api/file_system/file_system_api.cc

Issue 10663014: Add tests for chrome.fileSystem app API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added licenses to js files Created 8 years, 6 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/extensions/api/file_system/file_system_api.cc
diff --git a/chrome/browser/extensions/api/file_system/file_system_api.cc b/chrome/browser/extensions/api/file_system/file_system_api.cc
index 37460db1aef09c2b98b80a19ac311f13bc8a0729..bc052a4606201bb4975f6d962191214006380aed 100644
--- a/chrome/browser/extensions/api/file_system/file_system_api.cc
+++ b/chrome/browser/extensions/api/file_system/file_system_api.cc
@@ -32,6 +32,9 @@ namespace ChooseFile = file_system::ChooseFile;
namespace {
+bool g_skip_picker_for_test = false;
+FilePath* g_path_to_be_picked_for_test;
+
bool GetFilePathOfFileEntry(const std::string& filesystem_name,
const std::string& filesystem_path,
const content::RenderViewHost* render_view_host,
@@ -126,6 +129,21 @@ class FileSystemPickerFunction::FilePicker : public SelectFileDialog::Listener {
gfx::NativeWindow owning_window = web_contents ?
platform_util::GetTopLevel(web_contents->GetNativeView()) : NULL;
+ if (g_skip_picker_for_test) {
+ if (g_path_to_be_picked_for_test) {
+ content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE,
+ base::Bind(&FileSystemPickerFunction::FilePicker::FileSelected,
+ base::Unretained(this), *g_path_to_be_picked_for_test, 1,
+ static_cast<void*>(NULL)));
+ } else {
+ content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE,
+ base::Bind(
+ &FileSystemPickerFunction::FilePicker::FileSelectionCanceled,
+ base::Unretained(this), static_cast<void*>(NULL)));
+ }
+ return;
+ }
+
select_file_dialog_->SelectFile(for_save ?
SelectFileDialog::SELECT_SAVEAS_FILE :
SelectFileDialog::SELECT_OPEN_FILE,
@@ -183,6 +201,24 @@ bool FileSystemPickerFunction::ShowPicker(const FilePath& suggested_path,
return true;
}
+// static
+void FileSystemPickerFunction::SkipPickerAndAlwaysSelectPathForTest(
+ FilePath* path) {
+ g_skip_picker_for_test = true;
+ g_path_to_be_picked_for_test = path;
+}
+
+// static
+void FileSystemPickerFunction::SkipPickerAndAlwaysCancelForTest() {
+ g_skip_picker_for_test = true;
+ g_path_to_be_picked_for_test = NULL;
+}
+
+// static
+void FileSystemPickerFunction::StopSkippingPickerForTest() {
+ g_skip_picker_for_test = false;
+}
+
void FileSystemPickerFunction::FileSelected(const FilePath& path,
bool for_save) {
if (for_save) {

Powered by Google App Engine
This is Rietveld 408576698