Updated SessionManagerClient to use the multi-profile user policy calls.

chrome/browser/policy/cloud/cloud_policy_browsertest.cc

Index: chrome/browser/policy/cloud/cloud_policy_browsertest.cc
diff --git a/chrome/browser/policy/cloud/cloud_policy_browsertest.cc b/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
index 46c12435675aff33af7dc187fc383b197f51f8d6..4fc43968b21da382f4ca35872dabba1349a18fb7 100644
--- a/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
+++ b/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
@@ -43,10 +43,6 @@
 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h"
 #include "chromeos/chromeos_paths.h"
-#include "chromeos/dbus/mock_cryptohome_client.h"
-#include "chromeos/dbus/mock_dbus_thread_manager.h"
-#include "chromeos/dbus/mock_session_manager_client.h"
-#include "chromeos/dbus/mock_update_engine_client.h"
 #else
 #include "chrome/browser/policy/cloud/user_cloud_policy_manager.h"
 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"
@@ -66,41 +62,6 @@ namespace policy {
 
 namespace {
 
-#if defined(OS_CHROMEOS)
-
-const char kSanitizedUsername[] = "0123456789ABCDEF0123456789ABCDEF01234567";
-
-ACTION(GetSanitizedUsername) {
-  MessageLoop::current()->PostTask(
-      FROM_HERE,
-      base::Bind(arg1, chromeos::DBUS_METHOD_CALL_SUCCESS, kSanitizedUsername));
-}
-
-ACTION_P(RetrieveUserPolicy, storage) {
-  MessageLoop::current()->PostTask(FROM_HERE, base::Bind(arg0, *storage));
-}
-
-ACTION_P2(StoreUserPolicy, storage, user_policy_key_file) {
-  // The session_manager stores a copy of the policy key at
-  // /var/run/user_policy/$hash/policy.pub. Simulate that behavior here, so
-  // that the policy signature can be validated.
-  em::PolicyFetchResponse policy;
-  ASSERT_TRUE(policy.ParseFromString(arg0));
-  if (policy.has_new_public_key()) {
-    ASSERT_TRUE(file_util::CreateDirectory(user_policy_key_file.DirName()));
-    int result = file_util::WriteFile(
-        user_policy_key_file,
-        policy.new_public_key().data(),
-        policy.new_public_key().size());
-    ASSERT_EQ(static_cast<int>(policy.new_public_key().size()), result);
-  }
-
-  *storage = arg0;
-  MessageLoop::current()->PostTask(FROM_HERE, base::Bind(arg1, true));
-}
-
-#endif
-
 const char* GetTestUser() {
 #if defined(OS_CHROMEOS)
   return chromeos::UserManager::kStubUser;
@@ -184,29 +145,6 @@ class CloudPolicyTest : public InProcessBrowserTest {
 
     CommandLine* command_line = CommandLine::ForCurrentProcess();
     command_line->AppendSwitchASCII(switches::kDeviceManagementUrl, url);
-
-#if defined(OS_CHROMEOS)
-    ASSERT_TRUE(PathService::Override(chromeos::DIR_USER_POLICY_KEYS,
-                                      user_policy_key_dir()));
-
-    mock_dbus_thread_manager_ = new chromeos::MockDBusThreadManager();
-    chromeos::DBusThreadManager::InitializeForTesting(
-        mock_dbus_thread_manager_);
-    EXPECT_CALL(*mock_dbus_thread_manager_->mock_cryptohome_client(),
-                GetSanitizedUsername(_, _))
-        .WillRepeatedly(GetSanitizedUsername());
-    EXPECT_CALL(*mock_dbus_thread_manager_->mock_session_manager_client(),
-                StoreUserPolicy(_, _))
-        .WillRepeatedly(StoreUserPolicy(&session_manager_user_policy_,
-                                        user_policy_key_file()));
-    EXPECT_CALL(*mock_dbus_thread_manager_->mock_session_manager_client(),
-                RetrieveUserPolicy(_))
-        .WillRepeatedly(RetrieveUserPolicy(&session_manager_user_policy_));
-    EXPECT_CALL(*mock_dbus_thread_manager_->mock_update_engine_client(),
-                GetLastStatus())
-        .Times(1)
-        .WillOnce(Return(chromeos::MockUpdateEngineClient::Status()));
-#endif
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {
@@ -263,13 +201,12 @@ class CloudPolicyTest : public InProcessBrowserTest {
   }
 
 #if defined(OS_CHROMEOS)
-  base::FilePath user_policy_key_dir() {
-    return temp_dir_.path().AppendASCII("user_policy");
-  }
-
   base::FilePath user_policy_key_file() {
-    return user_policy_key_dir().AppendASCII(kSanitizedUsername)
-                                .AppendASCII("policy.pub");
+    base::FilePath user_policy_key_dir;
+    PathService::Get(chromeos::DIR_USER_POLICY_KEYS, &user_policy_key_dir);
+    return user_policy_key_dir
+        .AppendASCII(std::string(GetTestUser()) + "-profile")

[Mattias Nissler (ping if slow), 2013/05/10 12:40:15]

another call the the common helper here :)

[Joao da Silva, 2013/05/13 09:39:23]

Done.

+        .AppendASCII("policy.pub");
   }
 #endif
 
@@ -291,11 +228,6 @@ class CloudPolicyTest : public InProcessBrowserTest {
 
   base::ScopedTempDir temp_dir_;
   scoped_ptr<LocalPolicyTestServer> test_server_;
-
-#if defined(OS_CHROMEOS)
-  std::string session_manager_user_policy_;
-  chromeos::MockDBusThreadManager* mock_dbus_thread_manager_;
-#endif
 };
 
 IN_PROC_BROWSER_TEST_F(CloudPolicyTest, FetchPolicy) {