Fixed problem with incorrect use of $HOME (breaking multi user ChromeOS)

components/url_fixer/url_fixer.cc

 // Copyright (c) 2012 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 "components/url_fixer/url_fixer.h"
 
 #include <algorithm>
 
+#include "base/file_util.h"
+#include "base/files/file_path.h"
+#include "base/logging.h"
 #if defined(OS_POSIX)
-#include "base/environment.h"
+#include "base/path_service.h"
 #endif
-#include "base/file_util.h"
-#include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "net/base/escape.h"
 #include "net/base/filename_util.h"
 #include "net/base/net_util.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "url/url_file.h"
 #include "url/url_parse.h"
 #include "url/url_util.h"
 
@@ skipping 91 matching lines @@
   return true;
 }
 
 #if defined(OS_POSIX)
 // Given a path that starts with ~, return a path that starts with an
 // expanded-out /user/foobar directory.
 std::string FixupHomedir(const std::string& text) {
   DCHECK(text.length() > 0 && text[0] == '~');
 
   if (text.length() == 1 || text[1] == '/') {
-    const char* home = getenv(base::env_vars::kHome);
+    base::FilePath file_path;
     if (url_fixer::home_directory_override)
-      home = url_fixer::home_directory_override;
+      file_path = base::FilePath(url_fixer::home_directory_override);
+    else
+      PathService::Get(base::DIR_HOME, &file_path);
+
     // We'll probably break elsewhere if $HOME is undefined, but check here
     // just in case.
-    if (!home)
+    if (file_path.value().empty())
       return text;
-    return home + text.substr(1);
+    // Append requires to be a relative path, so we have to cut all preceeding
+    // '/' characters.
+    size_t i = 1;
+    while (i < text.length() && text[i] == '/')
+      ++i;
+    return file_path.Append(text.substr(i)).value();
   }
 
 // Otherwise, this is a path like ~foobar/baz, where we must expand to
 // user foobar's home directory.  Officially, we should use getpwent(),
 // but that is a nasty blocking call.
 
 #if defined(OS_MACOSX)
   static const char kHome[] = "/Users/";
 #else
   static const char kHome[] = "/home/";
@@ skipping 517 matching lines @@
       part->reset();
   }
 }
 
 bool url_fixer::IsEquivalentScheme(const std::string& scheme1,
                                    const std::string& scheme2) {
   return scheme1 == scheme2 ||
       (scheme1 == url::kAboutScheme && scheme2 == kChromeUIScheme) ||
       (scheme1 == kChromeUIScheme && scheme2 == url::kAboutScheme);
 }