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

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index 9b13dce34625f1d524e2b66f7bf268f9b07feddf..ae277b0fc35ce1a3da83afff2ba1b9bca568c5af 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -95,6 +95,7 @@
 #include "chromeos/audio/audio_devices_pref_handler.h"
 #include "chromeos/audio/audio_pref_handler.h"
 #include "chromeos/audio/cras_audio_handler.h"
+#include "chromeos/chromeos_paths.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/cryptohome/async_method_caller.h"
 #include "chromeos/cryptohome/cryptohome_library.h"
@@ -300,6 +301,16 @@ class DBusServices {
       cros_initialized_ = true;
     }
 
+    if (!base::chromeos::IsRunningOnChromeOS()) {
+      // Override this path on the desktop, so that the user policy key can be
+      // stored by the stub SessionManagerClient.
+      base::FilePath user_data_dir;
+      if (PathService::Get(chrome::DIR_USER_DATA, &user_data_dir)) {
+        PathService::Override(chromeos::DIR_USER_POLICY_KEYS,
+                              user_data_dir.AppendASCII("stub_user_policy"));
+      }
+    }
+
     // Initialize DBusThreadManager for the browser. This must be done after
     // the main message loop is started, as it uses the message loop.
     DBusThreadManager::Initialize();