ake string_util::WriteInto() DCHECK() that the supplied |length_with_null| > 1, meaning that the without-'\0' string is non-empty. This replaces the conditional code added recently that makes this case return NULL. It's easier to understand if it's simply an error to call WriteInto() in this case at all.
Add DCHECK()s or conditionals as appropriate to callers in order to ensure this assertion holds.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/8418034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112005 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/base/base_paths_mac.mm b/base/base_paths_mac.mm
index a9cd471b7..aed3ea8 100644
--- a/base/base_paths_mac.mm
+++ b/base/base_paths_mac.mm
@@ -18,24 +18,18 @@
namespace {
-bool GetNSExecutablePath(FilePath* path) WARN_UNUSED_RESULT;
-
-bool GetNSExecutablePath(FilePath* path) {
+void GetNSExecutablePath(FilePath* path) {
DCHECK(path);
// Executable path can have relative references ("..") depending on
// how the app was launched.
uint32_t executable_length = 0;
_NSGetExecutablePath(NULL, &executable_length);
- DCHECK_GE(executable_length, 1u);
+ DCHECK_GT(executable_length, 1u);
std::string executable_path;
- char* executable_path_c = WriteInto(&executable_path, executable_length);
- int rv = _NSGetExecutablePath(executable_path_c, &executable_length);
+ int rv = _NSGetExecutablePath(WriteInto(&executable_path, executable_length),
+ &executable_length);
DCHECK_EQ(rv, 0);
- DCHECK(!executable_path.empty());
- if ((rv != 0) || (executable_path.empty()))
- return false;
*path = FilePath(executable_path);
- return true;
}
// Returns true if the module for |address| is found. |path| will contain
@@ -58,7 +52,8 @@
bool PathProviderMac(int key, FilePath* result) {
switch (key) {
case base::FILE_EXE:
- return GetNSExecutablePath(result);
+ GetNSExecutablePath(result);
+ return true;
case base::FILE_MODULE:
return GetModulePathForAddress(result,
reinterpret_cast<const void*>(&base::PathProviderMac));
