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

sandbox/src/sandbox_utils.h

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// 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.
 
 #ifndef SANDBOX_SRC_SANDBOX_UTILS_H__
 #define SANDBOX_SRC_SANDBOX_UTILS_H__
 
 #include <windows.h>
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 14 matching lines @@
 // the functionality exposed by GetModuleHandleEx.
 bool GetModuleHandleHelper(DWORD flags, const wchar_t* module_name,
                            HMODULE* module);
 
 // Returns true if the current OS is Windows XP SP2 or later.
 bool IsXPSP2OrLater();
 
 void InitObjectAttribs(const std::wstring& name, ULONG attributes, HANDLE root,
                        OBJECT_ATTRIBUTES* obj_attr, UNICODE_STRING* uni_name);
 
-// The next 2 functions are copied from base\string_util.h and have been
-// slighty modified because we don't want to depend on ICU.
-template <class string_type>
-inline typename string_type::value_type* WriteInto(string_type* str,
-                                                   size_t length_with_null) {
-  str->reserve(length_with_null);
-  str->resize(length_with_null - 1);
-  return &((*str)[0]);
-}
-
-std::string WideToMultiByte(const std::wstring& wide);
-
 };  // namespace sandbox
 
 #endif  // SANDBOX_SRC_SANDBOX_UTILS_H__