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

sandbox/tests/common/controller.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 "sandbox/tests/common/controller.h"
 
 #include <string>
 
+#include "base/sys_string_conversions.h"
 #include "base/win/windows_version.h"
 #include "sandbox/src/sandbox_factory.h"
 #include "sandbox/src/sandbox_utils.h"
 
 namespace {
 
 static const int kDefaultTimeout = 3000;
 
 // Constructs a full path to a file inside the system32 folder.
 std::wstring MakePathToSys32(const wchar_t* name, bool is_obj_man_path) {
@@ skipping 235 matching lines @@
   if ((state <= MIN_STATE) || (state >= MAX_STATE))
     return SBOX_TEST_INVALID_PARAMETER;
 
   HMODULE module;
   if (!GetModuleHandleHelper(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS |
                                  GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
                              reinterpret_cast<wchar_t*>(&DispatchCall),
                              &module))
     return SBOX_TEST_FAILED_TO_EXECUTE_COMMAND;
 
-  std::string command_name = WideToMultiByte(argv[3]);
+  std::string command_name = base::SysWideToMultiByte(argv[3], CP_UTF8);
   CommandFunction command = reinterpret_cast<CommandFunction>(
                                 ::GetProcAddress(module, command_name.c_str()));
   if (!command)
     return SBOX_TEST_FAILED_TO_EXECUTE_COMMAND;
 
   if (BEFORE_INIT == state)
     return command(argc - 4, argv + 4);
   else if (EVERY_STATE == state)
     command(argc - 4, argv + 4);
 
   TargetServices* target = SandboxFactory::GetTargetServices();
   if (!target)
     return SBOX_TEST_FAILED_TO_EXECUTE_COMMAND;
 
   if (SBOX_ALL_OK != target->Init())
     return SBOX_TEST_FAILED_TO_EXECUTE_COMMAND;
 
   if (BEFORE_REVERT == state)
     return command(argc - 4, argv + 4);
   else if (EVERY_STATE == state)
     command(argc - 4, argv + 4);
 
   target->LowerToken();
   return command(argc - 4, argv + 4);
 }
 
 }  // namespace sandbox