[cros mp] Load profiles from /home/chronos/u-[$hash], add GetUserIdHashFromProfile()

chrome/browser/profiles/profile_manager.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 "chrome/browser/profiles/profile_manager.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 180 matching lines @@
 void CheckCryptohomeIsMounted(chromeos::DBusMethodCallStatus call_status,
                               bool is_mounted) {
   if (call_status != chromeos::DBUS_METHOD_CALL_SUCCESS) {
     LOG(ERROR) << "IsMounted call failed.";
     return;
   }
   if (!is_mounted)
     LOG(ERROR) << "Cryptohome is not mounted.";
 }
 
-// TODO(nkostylev): Remove this hack when http://crbug.com/224291 is fixed.
-// Now user homedirs are mounted to /home/user which is different from
-// user data dir (/home/chronos).
-base::FilePath GetChromeOSProfileDir(const base::FilePath& path) {
-  base::FilePath profile_dir(FILE_PATH_LITERAL("/home/user/"));
-  profile_dir = profile_dir.Append(path);
-  return profile_dir;
-}
 #endif
 
 } // namespace
 
 #if defined(ENABLE_SESSION_SERVICE)
 // static
 void ProfileManager::ShutdownSessionServices() {
   ProfileManager* pm = g_browser_process->profile_manager();
   if (!pm)  // Is NULL when running unit tests.
     return;
@@ skipping 123 matching lines @@
       NOTREACHED();
       return base::FilePath("");
     }
     // In case of multi-profiles ignore --login-profile switch.
     // TODO(nkostylev): Some cases like Guest mode will have empty username_hash
     // so default kLoginProfile dir will be used.
     std::string user_id_hash = g_browser_process->platform_part()->
         profile_helper()->active_user_id_hash();
     if (command_line.HasSwitch(switches::kMultiProfiles) &&
         !user_id_hash.empty()) {
-      profile_dir = base::FilePath(user_id_hash);
+      profile_dir = g_browser_process->platform_part()->
+          profile_helper()->GetActiveUserProfileDir();
     }
     relative_profile_dir = relative_profile_dir.Append(profile_dir);
     return relative_profile_dir;
   }
 #endif
   // TODO(mirandac): should not automatically be default profile.
   relative_profile_dir =
       relative_profile_dir.AppendASCII(chrome::kInitialProfile);
   return relative_profile_dir;
 }
@@ skipping 46 matching lines @@
     }
   }
   return to_return;
 }
 
 Profile* ProfileManager::GetDefaultProfile(
     const base::FilePath& user_data_dir) {
 #if defined(OS_CHROMEOS)
   base::FilePath default_profile_dir(user_data_dir);
   if (logged_in_) {
-    if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kMultiProfiles) &&
-        base::chromeos::IsRunningOnChromeOS()) {
-      // TODO(nkostylev): Change to [user_data_dir]/profile-[hash]
-      default_profile_dir = GetChromeOSProfileDir(GetInitialProfileDir());
-    } else {
-      default_profile_dir = default_profile_dir.Append(GetInitialProfileDir());
-    }
+    default_profile_dir = default_profile_dir.Append(GetInitialProfileDir());
   } else {
     default_profile_dir = GetDefaultProfileDir(user_data_dir);
   }
 #else
   base::FilePath default_profile_dir(user_data_dir);
   default_profile_dir = default_profile_dir.Append(GetInitialProfileDir());
 #endif
 #if defined(OS_CHROMEOS)
   if (!logged_in_) {
     Profile* profile = GetProfile(default_profile_dir);
@@ skipping 107 matching lines @@
 // static
 void ProfileManager::CreateDefaultProfileAsync(const CreateCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   ProfileManager* profile_manager = g_browser_process->profile_manager();
 
   base::FilePath default_profile_dir = profile_manager->user_data_dir_;
   // TODO(mirandac): current directory will not always be default in the future
   default_profile_dir = default_profile_dir.Append(
       profile_manager->GetInitialProfileDir());
 
-#if defined(OS_CHROMEOS)
-  // TODO(nkostylev): Change to [user_data_dir]/profile-[hash]
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kMultiProfiles) &&
-      base::chromeos::IsRunningOnChromeOS()) {
-    default_profile_dir = GetChromeOSProfileDir(
-        profile_manager->GetInitialProfileDir());
-  }
-#endif
-
   // Chrome OS specific note: since we pass string16() here as the icon_url,
   // profile cache information will not get updated with the is_managed value
   // so we're fine with passing all default values here.
   // On Chrome OS |is_managed| preference will get initialized in
   // Profile::CREATE_STATUS_CREATED callback.
   profile_manager->CreateProfileAsync(
       default_profile_dir, callback, string16(), string16(), false);
 }
 
 bool ProfileManager::AddProfile(Profile* profile) {
@@ skipping 613 matching lines @@
 ProfileManager::ProfileInfo::ProfileInfo(
     Profile* profile,
     bool created)
     : profile(profile),
       created(created) {
 }
 
 ProfileManager::ProfileInfo::~ProfileInfo() {
   ProfileDestroyer::DestroyProfileWhenAppropriate(profile.release());
 }