Check for empty paths in path_util

chrome/browser/extensions/path_util.cc

 // Copyright 2014 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 "chrome/browser/extensions/path_util.h"
 
 #include "base/path_service.h"
 #include "base/strings/sys_string_conversions.h"
 
 #if defined(OS_MACOSX)
@@ skipping 22 matching lines @@
   CFStringRef str;
   if (LSCopyDisplayNameForURL(url, &str) != noErr)
     return path.BaseName().value();
 
   std::string result(base::SysCFStringRefToUTF8(str));
   CFRelease(str);
   return result;
 }
 
 }  // namespace
+#endif  // defined(OS_MACOSX)
 
 base::FilePath PrettifyPath(const base::FilePath& source_path) {
   base::FilePath home_path;
-  PathService::Get(base::DIR_HOME, &home_path);
+  if (source_path.empty() || !PathService::Get(base::DIR_HOME, &home_path))
+    return source_path;
+
+  base::FilePath display_path = base::FilePath(FILE_PATH_LITERAL("~"));
+  if (source_path == home_path)
+    return display_path;
+
+#if defined(OS_MACOSX)
   DCHECK(source_path.IsAbsolute());
 
   // Break down the incoming path into components, and grab the display name
   // for every component. This will match app bundles, ".localized" folders,
   // and localized subfolders of the user's home directory.
   // Don't grab the display name of the first component, i.e., "/", as it'll
   // show up as the HDD name.
   std::vector<base::FilePath::StringType> components;
   source_path.GetComponents(&components);
-  base::FilePath display_path = base::FilePath(components[0]);
+  display_path = base::FilePath(components[0]);
   base::FilePath actual_path = display_path;
   for (std::vector<base::FilePath::StringType>::iterator i =
            components.begin() + 1; i != components.end(); ++i) {
     actual_path = actual_path.Append(*i);
     if (actual_path == home_path) {
-      display_path = base::FilePath("~");
+      display_path = base::FilePath(FILE_PATH_LITERAL("~"));

[Devlin, 2014/08/06 23:35:56]

Save the FILE_PATH_LITERAL so you don't have to keep redeclaring it (it'd be
fine the anon namespace above).

[gpdavis, 2014/08/07 01:20:06]

Done.

       home_path = base::FilePath();
       continue;
     }
     std::string display = GetDisplayBaseName(actual_path);
     display_path = display_path.Append(display);
   }
   DCHECK_EQ(actual_path.value(), source_path.value());
   return display_path;
-}
-#else   // defined(OS_MACOSX)
-base::FilePath PrettifyPath(const base::FilePath& source_path) {
-  base::FilePath home_path;
-  base::FilePath display_path = base::FilePath::FromUTF8Unsafe("~");
-  if (PathService::Get(base::DIR_HOME, &home_path) &&
-      home_path.AppendRelativePath(source_path, &display_path))
+#else  // defined(OS_MACOSX)
+  if (home_path.AppendRelativePath(source_path, &display_path))
     return display_path;
   return source_path;
+#endif  // defined(OS_MACOSX)
 }
-#endif  // defined(OS_MACOSX)
 
 }  // namespace path_util
 }  // namespace extensions