commit 51c15d4af3010279b937072a346e31a2046d729c
author Bartosz Fabianowski <bartfab@google.com> Fri Jan 27 13:43:30 2012
committer Gerrit <chrome-bot@google.com> Mon Jan 30 15:24:09 2012
tree 2732a0b6ef48ed912ecdc3dd811e717f12eb2275
parent aa50358c1baab21e6bf77194875da20eb80ce9ed

Deprecate libcros CryptohomeAsyncSetOwnerUser

This deprecates the CryptohomeAsyncSetOwnerUser method in libcros obsoleted
by the switch of cryptohomed to libpolicy.

BUG=chromium-os:25464
TEST=built chrome and libcros
CQ-DEPEND=I2c085b927fd5412edf02f9026cad5dd7fc608ccc

Change-Id: I0236456756cd136b505260a08ebce9bb2f429b7a
Reviewed-on: https://gerrit.chromium.org/gerrit/14947
Commit-Ready: Bartosz Fabianowski <bartfab@google.com>
Reviewed-by: Julian Pastarmov <pastarmovj@chromium.org>
Tested-by: Bartosz Fabianowski <bartfab@google.com>

chromeos_cros_api.h

diff --git a/chromeos_cros_api.h b/chromeos_cros_api.h
index a6b0ab9..39a5c53 100644
--- a/chromeos_cros_api.h
+++ b/chromeos_cros_api.h
@@ -344,12 +344,13 @@
 // 190: Deprecated DisconnectFromNetwork, SetAutoConnect, SetPassphrase,
 //      SetIdentity.
 // 191: Deprecated DisconnectBurnStatus, MonitorBurnStatus, RequestBurn.
+// 192: Deprecated CryptohomeAsyncSetOwnerUser.
 
 namespace chromeos {  // NOLINT
 
 enum CrosAPIVersion {
   kCrosAPIMinVersion = 188,
-  kCrosAPIVersion = 191
+  kCrosAPIVersion = 192
 };
 
 // Default path to pass to LoadCros: "/opt/google/chrome/chromeos/libcros.so"

chromeos_cryptohome.cc

diff --git a/chromeos_cryptohome.cc b/chromeos_cryptohome.cc
index 5b22ef1..ee32165 100644
--- a/chromeos_cryptohome.cc
+++ b/chromeos_cryptohome.cc
@@ -490,30 +490,10 @@
   return async_call_id;
 }
 
+// Deprecated
 extern "C"
 int ChromeOSCryptohomeAsyncSetOwnerUser(const char* username) {
-  dbus::BusConnection bus = dbus::GetSystemBusConnection();
-  dbus::Proxy proxy(bus,
-                    cryptohome::kCryptohomeServiceName,
-                    cryptohome::kCryptohomeServicePath,
-                    cryptohome::kCryptohomeInterface);
-  gint async_call_id = 0;
-  glib::ScopedError error;
-
-  if (!::dbus_g_proxy_call(proxy.gproxy(),
-                           cryptohome::kCryptohomeAsyncSetOwnerUser,
-                           &Resetter(&error).lvalue(),
-                           G_TYPE_STRING,
-                           username,
-                           G_TYPE_INVALID,
-                           G_TYPE_INT,
-                           &async_call_id,
-                           G_TYPE_INVALID)) {
-    LOG(WARNING) << cryptohome::kCryptohomeAsyncSetOwnerUser
-                 << " failed: "
-                 << (error->message ? error->message : "Unknown Error.");
-  }
-  return async_call_id;
+  return 0;
 }
 
 extern "C"

chromeos_cryptohome.h

diff --git a/chromeos_cryptohome.h b/chromeos_cryptohome.h
index 52d48f4..523d5c4 100644
--- a/chromeos_cryptohome.h
+++ b/chromeos_cryptohome.h
@@ -46,7 +46,6 @@
     bool replace_tracked_subdirectories,
     const char** tracked_subdirectories);
 extern int (*CryptohomeAsyncMountGuest)();
-extern int (*CryptohomeAsyncSetOwnerUser)(const char* username);
 extern bool (*CryptohomeTpmIsReady)();
 extern bool (*CryptohomeTpmIsEnabled)();
 extern bool (*CryptohomeTpmIsOwned)();

load.cc

diff --git a/load.cc b/load.cc
index 572e052..17ea97b 100644
--- a/load.cc
+++ b/load.cc
@@ -182,7 +182,6 @@
 DECL_FUNC_5(CryptohomeAsyncMountSafe, int, const char*, const char*, bool, bool,
             const char**);
 DECL_FUNC_0(CryptohomeAsyncMountGuest, int);
-DECL_FUNC_1(CryptohomeAsyncSetOwnerUser, int, const char*);
 DECL_FUNC_0(CryptohomeTpmIsReady, bool);
 DECL_FUNC_0(CryptohomeTpmIsEnabled, bool);
 DECL_FUNC_0(CryptohomeTpmIsOwned, bool);
@@ -315,7 +314,6 @@
   INIT_FUNC(CryptohomeIsMounted);
   INIT_FUNC(CryptohomeAsyncMountSafe);
   INIT_FUNC(CryptohomeAsyncMountGuest);
-  INIT_FUNC(CryptohomeAsyncSetOwnerUser);
   INIT_FUNC(CryptohomeTpmIsReady);
   INIT_FUNC(CryptohomeTpmIsEnabled);
   INIT_FUNC(CryptohomeTpmIsOwned);