chromeos: Use /tmp as mount root directory for stubs.

Move RegisterFileSystem calls for default system mount points to CrosMountProvider.
Add CrosDisksClient::GetArchiveMountRootDirectory/GetDiskMountRootDirectory.

BUG=178987
TEST=git cl try


Review URL: https://chromiumcodereview.appspot.com/12397002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185898 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 26 insertions, 0 deletions

diff --git a/chromeos/dbus/cros_disks_client.cc b/chromeos/dbus/cros_disks_client.cc
index ab24b37..0116a63 100644
--- a/chromeos/dbus/cros_disks_client.cc
+++ b/chromeos/dbus/cros_disks_client.cc
@@ -7,6 +7,8 @@
 #include <map>
 
 #include "base/bind.h"
+#include "base/chromeos/chromeos_version.h"
+#include "base/files/file_path.h"
 #include "base/stl_util.h"
 #include "base/stringprintf.h"
 #include "dbus/bus.h"
@@ -610,4 +612,18 @@ CrosDisksClient* CrosDisksClient::Create(DBusClientImplementationType type,
   return new CrosDisksClientStubImpl();
 }
 
+// static
+base::FilePath CrosDisksClient::GetArchiveMountPoint() {
+  return base::FilePath(base::chromeos::IsRunningOnChromeOS() ?
+                        FILE_PATH_LITERAL("/media/archive") :
+                        FILE_PATH_LITERAL("/tmp/chromeos/media/archive"));
+}
+
+// static
+base::FilePath CrosDisksClient::GetRemovableDiskMountPoint() {
+  return base::FilePath(base::chromeos::IsRunningOnChromeOS() ?
+                        FILE_PATH_LITERAL("/media/removable") :
+                        FILE_PATH_LITERAL("/tmp/chromeos/media/removable"));
+}
+
 }  // namespace chromeos
diff --git a/chromeos/dbus/cros_disks_client.h b/chromeos/dbus/cros_disks_client.h
index ea0e425..047aeca 100644
--- a/chromeos/dbus/cros_disks_client.h
+++ b/chromeos/dbus/cros_disks_client.h
@@ -13,6 +13,10 @@
 #include "chromeos/chromeos_export.h"
 #include "chromeos/dbus/dbus_client_implementation_type.h"
 
+namespace base {
+class FilePath;
+}
+
 namespace dbus {
 class Bus;
 class Response;
@@ -288,6 +292,12 @@ class CHROMEOS_EXPORT CrosDisksClient {
   static CrosDisksClient* Create(DBusClientImplementationType type,
                                  dbus::Bus* bus);
 
+  // Returns the path of the mount point for archive files.
+  static base::FilePath GetArchiveMountPoint();
+
+  // Returns the path of the mount point for removable disks.
+  static base::FilePath GetRemovableDiskMountPoint();
+
  protected:
   // Create() should be used instead.
   CrosDisksClient();