Make sure ShellIntegration::CommandLineArgsForLauncher respects the UserDataDir policy.

chrome/browser/policy/policy_path_parser_mac.mm

 // Copyright (c) 2011 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/policy/policy_path_parser.h"
 
+#include "base/basictypes.h"
+#include "base/file_path.h"
 #include "base/logging.h"
 #include "base/sys_string_conversions.h"
+#import "base/mac/scoped_nsautorelease_pool.h"
+#include "policy/policy_constants.h"
 
 #import <Cocoa/Cocoa.h>
 #import <SystemConfiguration/SCDynamicStore.h>
 #import <SystemConfiguration/SCDynamicStoreCopySpecific.h>
 
 #include <string>
 
 namespace policy {
 
 namespace path_parser {
@@ skipping 64 matching lines @@
                      base::SysCFStringRefToUTF8(machinename));
       CFRelease(machinename);
     } else {
       LOG(ERROR) << "Machine name variable can not be resolved.";
     }
     CFRelease(store);
   }
   return result;
 }
 
+void CheckUserDataDirPolicy(base::FilePath* user_data_dir) {
+  base::mac::ScopedNSAutoreleasePool pool;
+
+  // Since the configuration management infrastructure is not initialized when
+  // this code runs, read the policy preference directly.
+  NSString* key = base::SysUTF8ToNSString(policy::key::kUserDataDir);
+  NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults];
+  NSString* value = [defaults stringForKey:key];
+  if (value && [defaults objectIsForcedForKey:key]) {
+    std::string string_value = base::SysNSStringToUTF8(value);
+    // Now replace any vars the user might have used.
+    string_value =
+        policy::path_parser::ExpandPathVariables(string_value);
+    *user_data_dir = FilePath(string_value);

[brettw, 2013/02/19 04:49:52]

Use base::FilePath

[pastarmovj, 2013/02/19 14:09:43]

Done.

+  }
+}
+
 }  // namespace path_parser
 
 }  // namespace policy