summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-13 09:18:34 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-13 09:18:34 +0000
commit6c8152e083e52454063fd717ecc0bb193b0c808d (patch)
tree17cdfdd9a455c4f6c2b0c39cf4e24616fcc106b9 /content
parentf91a6f86d1847f2335dabf4d1757c5af662c7851 (diff)
downloadchromium_src-6c8152e083e52454063fd717ecc0bb193b0c808d.zip
chromium_src-6c8152e083e52454063fd717ecc0bb193b0c808d.tar.gz
chromium_src-6c8152e083e52454063fd717ecc0bb193b0c808d.tar.bz2
Cleanup: Remove deprecated version of file_util::AppendToPath().
BUG=24672 TEST=none Review URL: http://codereview.chromium.org/9585001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126363 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/common/sandbox_policy.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/content/common/sandbox_policy.cc b/content/common/sandbox_policy.cc
index c8caab9..954a861 100644
--- a/content/common/sandbox_policy.cc
+++ b/content/common/sandbox_policy.cc
@@ -290,11 +290,11 @@ bool AddGenericPolicy(sandbox::TargetPolicy* policy) {
if (long_path_return_value == 0 || long_path_return_value >= MAX_PATH)
return false;
- string16 debug_message(long_path_buf);
- file_util::AppendToPath(&debug_message, L"debug_message.exe");
+ FilePath debug_message(long_path_buf);
+ debug_message = debug_message.AppendASCII("debug_message.exe");
result = policy->AddRule(sandbox::TargetPolicy::SUBSYS_PROCESS,
sandbox::TargetPolicy::PROCESS_MIN_EXEC,
- debug_message.c_str());
+ debug_message.value().c_str());
if (result != sandbox::SBOX_ALL_OK)
return false;
#endif // NDEBUG
@@ -580,7 +580,7 @@ base::ProcessHandle StartProcessWithAccess(CommandLine* cmd_line,
(base::win::OSInfo::GetInstance()->wow64_status() ==
base::win::OSInfo::WOW64_DISABLED)) {
const SIZE_T kOneGigabyte = 1 << 30;
- void *nacl_mem = VirtualAllocEx(target.hProcess,
+ void* nacl_mem = VirtualAllocEx(target.hProcess,
NULL,
kOneGigabyte,
MEM_RESERVE,