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

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/ash_switches.h"
@@ skipping 78 matching lines @@
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/audio/audio_devices_pref_handler.h"
 #include "chromeos/audio/audio_pref_handler.h"
 #include "chromeos/audio/cras_audio_handler.h"
 #include "chromeos/audio/cras_audio_switch_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"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "chromeos/disks/disk_mount_manager.h"
 #include "chromeos/ime/input_method_manager.h"
 #include "chromeos/ime/xkeyboard.h"
 #include "chromeos/login/login_state.h"
@@ skipping 185 matching lines @@
   explicit DBusServices(const content::MainFunctionParams& parameters)
       : cros_initialized_(false) {
     // Initialize CrosLibrary only for the browser, unless running tests
     // (which do their own CrosLibrary setup).
     if (!parameters.ui_task) {
       const bool use_stub = !base::chromeos::IsRunningOnChromeOS();
       CrosLibrary::Initialize(use_stub);
       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();
     CrosDBusService::Initialize();
 
     LoginState::Initialize();
     CertLoader::Initialize();
     CertLibrary::Initialize();
     CryptohomeLibrary::Initialize();
 
@@ skipping 589 matching lines @@
   trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0);
   trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0);
   trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0);
   trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0);
   trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0);
   // This is necessary to start the experiment as a side effect.
   trial->group();
 }
 
 }  //  namespace chromeos