Multi-Profile in Files.app: always mount per-profile "Downloads" folder.

chrome/browser/chromeos/file_manager/path_util.cc

 // Copyright 2013 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/chromeos/file_manager/path_util.h"
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
-#include "base/path_service.h"
 #include "base/sys_info.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/login/users/user.h"
 #include "chrome/browser/chromeos/login/users/user_manager.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #include "net/base/escape.h"
 
 namespace file_manager {
 namespace util {
 
 namespace {
 
 const char kDownloadsFolderName[] = "Downloads";
 const base::FilePath::CharType kOldDownloadsFolderPath[] =
     FILE_PATH_LITERAL("/home/chronos/user/Downloads");
 const base::FilePath::CharType kOldDriveFolderPath[] =
     FILE_PATH_LITERAL("/special/drive");
 // Unintended path introduced in crbug.com/363026.
 const base::FilePath::CharType kBuggyDriveFolderPath[] =
     FILE_PATH_LITERAL("/special/drive-user");
 
 }  // namespace
 
 base::FilePath GetDownloadsFolderForProfile(Profile* profile) {
-  if (!base::SysInfo::IsRunningOnChromeOS()) {
-    // On the developer run on Linux desktop build, use $HOME/Downloads for ease
-    // for accessing local files for debugging.
-    base::FilePath path;
-    CHECK(PathService::Get(base::DIR_HOME, &path));
-    return path.AppendASCII(kDownloadsFolderName);
+  // On non-ChromeOS system (test+development), the primary profile uses
+  // $HOME/Downloads for ease for accessing local files for debugging.
+  if (!base::SysInfo::IsRunningOnChromeOS() &&
+      chromeos::UserManager::IsInitialized()) {
+    const chromeos::User* const user =
+        chromeos::UserManager::Get()->GetUserByProfile(
+            profile->GetOriginalProfile());
+    const chromeos::User* const primary_user =
+        chromeos::UserManager::Get()->GetPrimaryUser();
+    if (user == primary_user)
+      return DownloadPrefs::GetDefaultDownloadDirectory();
   }
   return profile->GetPath().AppendASCII(kDownloadsFolderName);
 }
 
 bool MigratePathFromOldFormat(Profile* profile,
                               const base::FilePath& old_path,
                               base::FilePath* new_path) {
   // M34:
   // /home/chronos/user/Downloads/xxx => /home/chronos/u-hash/Downloads/xxx
   // /special/drive => /special/drive-xxx
@@ skipping 53 matching lines @@
   chromeos::User* const user =
       chromeos::UserManager::IsInitialized() ?
           chromeos::UserManager::Get()->GetUserByProfile(
               profile->GetOriginalProfile()) : NULL;
   const std::string id = user ? "-" + user->username_hash() : "";
   return net::EscapePath(kDownloadsFolderName + id);
 }
 
 }  // namespace util
 }  // namespace file_manager