Use multi-profile mount point by default after browser crash and in Guest session.

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 298 matching lines @@
 }
 
 base::FilePath ProfileManager::GetInitialProfileDir() {
   base::FilePath relative_profile_dir;
 #if defined(OS_CHROMEOS)
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (logged_in_) {
     base::FilePath profile_dir;
     // If the user has logged in, pick up the new profile.
     if (command_line.HasSwitch(chromeos::switches::kLoginProfile)) {
-      profile_dir = command_line.GetSwitchValuePath(
-          chromeos::switches::kLoginProfile);
+      // TODO(nkostylev): Remove this code completely once we eliminate
+      // legacy --login-profile=user switch and enable multi-profiles on CrOS

[sail, 2013/09/18 18:17:20]

Normally we also include a bug number for these types of TODOs.

[Nikita (slow), 2013/09/19 08:17:35]

Done.

+      // by default.
+      std::string login_profile_value =
+          command_line.GetSwitchValueASCII(chromeos::switches::kLoginProfile);
+      if (login_profile_value == chrome::kLegacyProfileDir ||
+          login_profile_value == chrome::kTestUserProfileDir) {
+        profile_dir = base::FilePath(login_profile_value);
+      } else {
+        profile_dir = g_browser_process->platform_part()->profile_helper()->
+            GetUserProfileDir(login_profile_value);
+      }
     } else if (!command_line.HasSwitch(switches::kMultiProfiles)) {
       // We should never be logged in with no profile dir unless
       // multi-profiles are enabled.
       // In that case profile dir will be defined by user_id hash.
       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.
@@ skipping 836 matching lines @@
 ProfileManager::ProfileInfo::ProfileInfo(
     Profile* profile,
     bool created)
     : profile(profile),
       created(created) {
 }
 
 ProfileManager::ProfileInfo::~ProfileInfo() {
   ProfileDestroyer::DestroyProfileWhenAppropriate(profile.release());
 }