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

Unified Diff: chrome/browser/chromeos/extensions/file_manager/file_manager_private_apitest.cc

Issue 1137383002: Show the eject button only for removabled and file handlers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed tests. Created 5 years, 7 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/extensions/file_manager/private_api_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/extensions/file_manager/file_manager_private_apitest.cc
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_manager_private_apitest.cc b/chrome/browser/chromeos/extensions/file_manager/file_manager_private_apitest.cc
index 32523c1315b6f43bd7c818eeba086aa309fcd022..3653a7f59d73fb5f2be0447276371601b2c30748 100644
--- a/chrome/browser/chromeos/extensions/file_manager/file_manager_private_apitest.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/file_manager_private_apitest.cc
@@ -8,7 +8,9 @@
#include "chrome/browser/chromeos/extensions/file_manager/event_router.h"
#include "chrome/browser/chromeos/file_manager/drive_test_util.h"
#include "chrome/browser/chromeos/file_manager/file_watcher.h"
+#include "chrome/browser/chromeos/file_system_provider/provided_file_system_info.h"
#include "chrome/browser/extensions/extension_apitest.h"
+#include "chrome/common/extensions/api/file_system_provider_capabilities/file_system_provider_capabilities_handler.h"
#include "chrome/test/base/testing_profile.h"
#include "chrome/test/base/ui_test_utils.h"
#include "chromeos/dbus/cros_disks_client.h"
@@ -311,6 +313,17 @@ IN_PROC_BROWSER_TEST_F(FileManagerPrivateApiTest, Mount) {
file_manager::test_util::WaitUntilDriveMountPointIsAdded(
browser()->profile());
+ // Add a provided file system, to test passing the |configurable| and
+ // |source| flags properly down to Files app.
+ chromeos::file_system_provider::ProvidedFileSystemInfo info(
+ "testing-extension-id", chromeos::file_system_provider::MountOptions(),
+ base::FilePath(), true /* configurable */, extensions::SOURCE_NETWORK);
+
+ file_manager::VolumeManager::Get(browser()->profile())
+ ->AddVolumeForTesting(
+ make_linked_ptr(file_manager::Volume::CreateForProvidedFileSystem(
+ info, file_manager::MOUNT_CONTEXT_AUTO)));
+
// We will call fileManagerPrivate.unmountVolume once. To test that method, we
// check that UnmountPath is really called with the same value.
EXPECT_CALL(*disk_mount_manager_mock_, UnmountPath(_, _, _))
« no previous file with comments | « no previous file | chrome/browser/chromeos/extensions/file_manager/private_api_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698