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

service.h

 // Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 #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
 
 // Service
 // Provides a wrapper for exporting CryptohomeInterface to
 // D-Bus and entering the glib run loop.
 //
 // ::g_type_init() must be called before this class is used.
 //
 // TODO(wad) make an AbstractDbusService class which wraps a placeholder
@@ skipping 34 matching lines @@
                               gchar *to_key,
                               gboolean *OUT_success,
                               GError **error);
   virtual gboolean Remove(gchar *user,
                           gboolean *OUT_success,
                           GError **error);
   virtual gboolean GetSystemSalt(GArray **OUT_salt, GError **error);
   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:
   virtual GMainLoop *main_loop() { return loop_; }
 
  private:
   GMainLoop *loop_;
   // 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_