Make string_util::WriteInto() DCHECK() that the supplied |length_with_null| > 1, meaning that the...

sandbox/src/process_policy_test.cc

 // 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 <memory>
 #include <string>
 
+#include "base/sys_string_conversions.h"
 #include "base/win/scoped_handle.h"
 #include "sandbox/src/sandbox.h"
 #include "sandbox/src/sandbox_policy.h"
 #include "sandbox/src/sandbox_factory.h"
-#include "sandbox/src/sandbox_utils.h"
 #include "sandbox/tests/common/controller.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 // While the shell API provides better calls than this home brew function
 // we use GetSystemWindowsDirectoryW which does not query the registry so
 // it is safe to use after revert.
 std::wstring MakeFullPathToSystem32(const wchar_t* name) {
   wchar_t windows_path[MAX_PATH] = {0};
@@ skipping 37 matching lines @@
   } else {
     ret1 = sandbox::SBOX_TEST_SUCCEEDED;
   }
 
   // Do the same with the ansi version of the api
   STARTUPINFOA sia = {sizeof(sia)};
   sandbox::SboxTestResult ret2 = sandbox::SBOX_TEST_FAILED;
 
   std::string narrow_cmd_line;
   if (cmd_line)
-    narrow_cmd_line = sandbox::WideToMultiByte(cmd_line);
+    narrow_cmd_line = base::SysWideToMultiByte(cmd_line, CP_UTF8);
   if (!::CreateProcessA(
-        exe_name ? sandbox::WideToMultiByte(exe_name).c_str() : NULL,
+        exe_name ? base::SysWideToMultiByte(exe_name, CP_UTF8).c_str() : NULL,
         cmd_line ? const_cast<char*>(narrow_cmd_line.c_str()) : NULL,
         NULL, NULL, FALSE, 0, NULL, NULL, &sia, &pi)) {
     DWORD last_error = GetLastError();
     if ((ERROR_NOT_ENOUGH_QUOTA == last_error) ||
         (ERROR_ACCESS_DENIED == last_error) ||
         (ERROR_FILE_NOT_FOUND == last_error)) {
       ret2 = sandbox::SBOX_TEST_DENIED;
     } else {
       ret2 = sandbox::SBOX_TEST_FAILED;
     }
@@ skipping 202 matching lines @@
   ASSERT_TRUE(!exe_path.empty());
   EXPECT_TRUE(runner.AddRule(TargetPolicy::SUBSYS_PROCESS,
                              TargetPolicy::PROCESS_ALL_EXEC,
                              exe_path.c_str()));
 
   EXPECT_EQ(SBOX_TEST_SUCCEEDED,
             runner.RunTest(L"Process_GetChildProcessToken findstr.exe"));
 }
 
 }  // namespace sandbox