Revert 168563 - Wire up local account policy DBus calls in SessionManagerClient.

BUG=chromium-os:35715
TEST=None


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

You had a green linux_chromeos try run, but unfortunately, clang is pickier:
http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20%28Clang%20dbg%29/builds/24522

TBR=mnissler@chromium.org
Review URL: https://codereview.chromium.org/11308106

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

3 files changed, 9 insertions, 84 deletions

diff --git a/chromeos/dbus/mock_session_manager_client.h b/chromeos/dbus/mock_session_manager_client.h
index 2841439..25ce152 100644
--- a/chromeos/dbus/mock_session_manager_client.h
+++ b/chromeos/dbus/mock_session_manager_client.h
@@ -34,19 +34,10 @@ class MockSessionManagerClient : public SessionManagerClient {
   MOCK_METHOD0(GetIsScreenLocked, bool(void));
   MOCK_METHOD1(RetrieveDevicePolicy, void(const RetrievePolicyCallback&));
   MOCK_METHOD1(RetrieveUserPolicy, void(const RetrievePolicyCallback&));
-  MOCK_METHOD2(RetrieveDeviceLocalAccountPolicy,
-               void(const std::string&,
-                    const RetrievePolicyCallback&));
-  MOCK_METHOD2(StoreDevicePolicy,
-               void(const std::string&,
-                    const StorePolicyCallback&));
-  MOCK_METHOD2(StoreUserPolicy,
-               void(const std::string&,
-                    const StorePolicyCallback&));
-  MOCK_METHOD3(StoreDeviceLocalAccountPolicy,
-               void(const std::string&,
-                    const std::string&,
-                    const StorePolicyCallback&));
+  MOCK_METHOD2(StoreDevicePolicy, void(const std::string&,
+                                       const StorePolicyCallback&));
+  MOCK_METHOD2(StoreUserPolicy, void(const std::string&,
+                                     const StorePolicyCallback&));
 };
 
 }  // namespace chromeos
diff --git a/chromeos/dbus/session_manager_client.cc b/chromeos/dbus/session_manager_client.cc
index ff11e1a..67c517c 100644
--- a/chromeos/dbus/session_manager_client.cc
+++ b/chromeos/dbus/session_manager_client.cc
@@ -180,24 +180,6 @@ class SessionManagerClientImpl : public SessionManagerClient {
                        callback);
   }
 
-  virtual void RetrieveDeviceLocalAccountPolicy(
-      const std::string& account_name,
-      const RetrievePolicyCallback& callback) {
-    dbus::MethodCall method_call(
-        login_manager::kSessionManagerInterface,
-        login_manager::kSessionManagerRetrieveDeviceLocalAccountPolicy);
-    dbus::MessageWriter writer(&method_call);
-    writer.AppendString(account_name);
-    session_manager_proxy_->CallMethod(
-        &method_call,
-        dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
-        base::Bind(
-            &SessionManagerClientImpl::OnRetrievePolicy,
-            weak_ptr_factory_.GetWeakPtr(),
-            login_manager::kSessionManagerRetrieveDeviceLocalAccountPolicy,
-            callback));
-  }
-
   virtual void StoreDevicePolicy(const std::string& policy_blob,
                                  const StorePolicyCallback& callback) OVERRIDE {
     CallStorePolicy(login_manager::kSessionManagerStorePolicy,
@@ -210,28 +192,6 @@ class SessionManagerClientImpl : public SessionManagerClient {
                     policy_blob, callback);
   }
 
-  virtual void StoreDeviceLocalAccountPolicy(
-      const std::string& account_name,
-      const std::string& policy_blob,
-      const StorePolicyCallback& callback) OVERRIDE {
-    dbus::MethodCall method_call(
-        login_manager::kSessionManagerInterface,
-        login_manager::kSessionManagerStoreDeviceLocalAccountPolicy);
-    dbus::MessageWriter writer(&method_call);
-    writer.AppendString(account_name);
-    // static_cast does not work due to signedness.
-    writer.AppendArrayOfBytes(
-        reinterpret_cast<const uint8*>(policy_blob.data()), policy_blob.size());
-    session_manager_proxy_->CallMethod(
-        &method_call,
-        dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
-        base::Bind(
-            &SessionManagerClientImpl::OnStorePolicy,
-            weak_ptr_factory_.GetWeakPtr(),
-            login_manager::kSessionManagerStoreDeviceLocalAccountPolicy,
-            callback));
-  }
-
  private:
   // Makes a method call to the session manager with no arguments and no
   // response.
@@ -444,11 +404,6 @@ class SessionManagerClientStubImpl : public SessionManagerClient {
       const RetrievePolicyCallback& callback) OVERRIDE {
     callback.Run("");
   }
-  virtual void RetrieveDeviceLocalAccountPolicy(
-      const std::string& account_name,
-      const RetrievePolicyCallback& callback) OVERRIDE {
-    callback.Run("");
-  }
   virtual void StoreDevicePolicy(const std::string& policy_blob,
                                  const StorePolicyCallback& callback) OVERRIDE {
     callback.Run(true);
@@ -457,12 +412,6 @@ class SessionManagerClientStubImpl : public SessionManagerClient {
                                const StorePolicyCallback& callback) OVERRIDE {
     callback.Run(true);
   }
-  virtual void StoreDeviceLocalAccountPolicy(
-      const std::string& account_name,
-      const std::string& policy_blob,
-      const StorePolicyCallback& callback) OVERRIDE {
-    callback.Run(true);
-  }
 
  private:
   ObserverList<Observer> observers_;
diff --git a/chromeos/dbus/session_manager_client.h b/chromeos/dbus/session_manager_client.h
index d7b91d4..ff38e8c 100644
--- a/chromeos/dbus/session_manager_client.h
+++ b/chromeos/dbus/session_manager_client.h
@@ -82,10 +82,9 @@ class CHROMEOS_EXPORT SessionManagerClient {
   // need to know the current screen lock state when they are added.
   virtual bool GetIsScreenLocked() = 0;
 
-  // Used for RetrieveDevicePolicy, RetrieveUserPolicy and
-  // RetrieveDeviceLocalAccountPolicy. Takes a serialized protocol buffer as
-  // string.  Upon success, we will pass a protobuf to the callback.  On
-  // failure, we will pass "".
+  // Used for RetrieveDevicePolicy and RetrieveUserPolicy. Takes a serialized
+  // protocol buffer as string.  Upon success, we will pass a protobuf to the
+  // callback.  On failure, we will pass "".
   typedef base::Callback<void(const std::string&)> RetrievePolicyCallback;
 
   // Fetches the device policy blob stored by the session manager.  Upon
@@ -97,15 +96,8 @@ class CHROMEOS_EXPORT SessionManagerClient {
   // call the provided callback.
   virtual void RetrieveUserPolicy(const RetrievePolicyCallback& callback) = 0;
 
-  // Fetches the policy blob associated with the specified device-local account
-  // from session manager.  |callback| is invoked up on completion.
-  virtual void RetrieveDeviceLocalAccountPolicy(
-      const std::string& account_id,
-      const RetrievePolicyCallback& callback) = 0;
-
-  // Used for StoreDevicePolicy, StoreUserPolicy and
-  // StoreDeviceLocalAccountPolicy. Takes a boolean indicating whether the
-  // operation was successful or not.
+  // Used for StoreDevicePolicy and StoreUserPolicy. Takes a boolean indicating
+  // whether the operation was successful or not.
   typedef base::Callback<void(bool)> StorePolicyCallback;
 
   // Attempts to asynchronously store |policy_blob| as device policy.  Upon
@@ -119,13 +111,6 @@ class CHROMEOS_EXPORT SessionManagerClient {
   virtual void StoreUserPolicy(const std::string& policy_blob,
                                const StorePolicyCallback& callback) = 0;
 
-  // Sends a request to store a policy blob for the specified device-local
-  // account. The result of the operation is reported through |callback|.
-  virtual void StoreDeviceLocalAccountPolicy(
-      const std::string& account_id,
-      const std::string& policy_blob,
-      const StorePolicyCallback& callback) = 0;
-
   // Creates the instance.
   static SessionManagerClient* Create(DBusClientImplementationType type,
                                       dbus::Bus* bus);