Update on feedback, update dbus API, add unit tests. TEST=manual,unit,BVT BUG=3628 323

service.h

Index: service.h
diff --git a/service.h b/service.h
index 82f847242c095c7c4c9ca36f39df629b7116f043..1a20cea7cb3c6fca322ff4e16441118933b4ef1f 100644
--- a/service.h
+++ b/service.h
@@ -4,19 +4,20 @@
 #ifndef CRYPTOHOME_SERVICE_H_
 #define CRYPTOHOME_SERVICE_H_
 
-#include <dbus/dbus-glib.h>
-#include <glib-object.h>
-
 #include <base/logging.h>
+#include <base/scoped_ptr.h>
 #include <chromeos/dbus/abstract_dbus_service.h>
 #include <chromeos/dbus/dbus.h>
 #include <chromeos/dbus/service_constants.h>
 #include <chromeos/glib/object.h>
+#include <dbus/dbus-glib.h>
+#include <glib-object.h>
 
-#include "cryptohome/mount.h"
+#include "mount.h"
 
 namespace cryptohome {
 namespace gobject {
+
 struct Cryptohome;
 }  // namespace gobject
 
@@ -71,8 +72,12 @@ class Service : public chromeos::dbus::AbstractDbusService {
   virtual gboolean IsMounted(gboolean *OUT_is_mounted, GError **error);
   virtual gboolean Mount(gchar *user,
                          gchar *key,
+                         gint *OUT_error,
                          gboolean *OUT_done,
                          GError **error);
+  virtual gboolean MountGuest(gint *OUT_error,
+                              gboolean *OUT_done,
+                              GError **error);
   virtual gboolean Unmount(gboolean *OUT_done, GError **error);
 
  protected:
@@ -83,9 +88,11 @@ class Service : public chromeos::dbus::AbstractDbusService {
   // Can't use scoped_ptr for cryptohome_ because memory is allocated by glib.
   gobject::Cryptohome *cryptohome_;
   chromeos::Blob system_salt_;
+  scoped_ptr<cryptohome::Mount> default_mount_;
   cryptohome::Mount* mount_;
   DISALLOW_COPY_AND_ASSIGN(Service);
 };
 
-}  // cryptohome
+}  // namespace cryptohome
+
 #endif  // CRYPTOHOME_SERVICE_H_