Add a command line "--profile-directory="name of profile directory to load"" switch

chrome/browser/browser_main.cc

 // Copyright (c) 2011 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/browser_main.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 879 matching lines @@
       policy->Release();
     }
   }
 #endif
 }
 
 // Initializes the profile, possibly doing some user prompting to pick a
 // fallback profile. Returns the newly created profile, or NULL if startup
 // should not continue.
 Profile* CreateProfile(const MainFunctionParams& parameters,
-                       const FilePath& user_data_dir) {
-  Profile* profile = ProfileManager::IsMultipleProfilesEnabled() ?
-      g_browser_process->profile_manager()->GetLastUsedProfile(user_data_dir) :
-      g_browser_process->profile_manager()->GetDefaultProfile(user_data_dir);
+                       const FilePath& user_data_dir,
+                       const CommandLine& parsed_command_line) {
+  Profile* profile;
+  if (ProfileManager::IsMultipleProfilesEnabled()) {
+    if (parsed_command_line.HasSwitch(switches::kProfileDirectory)) {
+      g_browser_process->local_state()->SetString(prefs::kProfileLastUsed,
+          parsed_command_line.GetSwitchValueASCII(
+              switches::kProfileDirectory));
+    }
+    profile = g_browser_process->profile_manager()->GetLastUsedProfile(
+        user_data_dir);
+  } else {
+    profile = g_browser_process->profile_manager()->GetDefaultProfile(
+        user_data_dir);
+  }
+
   if (profile)
     return profile;
 
 #if defined(OS_WIN)
   // Ideally, we should be able to run w/o access to disk.  For now, we
   // prompt the user to pick a different user-data-dir and restart chrome
   // with the new dir.
   // http://code.google.com/p/chromium/issues/detail?id=11510
   FilePath new_user_data_dir = UserDataDirDialog::RunUserDataDirDialog(
       user_data_dir);
@@ skipping 735 matching lines @@
     std::string username =
         parsed_command_line.GetSwitchValueASCII(switches::kLoginUser);
     VLOG(1) << "Relaunching browser for user: " << username;
     chromeos::UserManager::Get()->UserLoggedIn(username);
 
     // Redirects Chrome logging to the user data dir.
     logging::RedirectChromeLogging(parsed_command_line);
   }
 #endif
 
-  Profile* profile = CreateProfile(parameters, user_data_dir);
+  Profile* profile = CreateProfile(parameters, user_data_dir,
+                                   parsed_command_line);
   if (!profile)
     return content::RESULT_CODE_NORMAL_EXIT;
 
   // Post-profile init ---------------------------------------------------------
 
 #if defined(OS_CHROMEOS)
   // Handling the user cloud policy initialization for case 2 mentioned above.
   // We do this after the profile creation since we need the TokenService.
   if (parsed_command_line.HasSwitch(switches::kLoginUser) &&
       !parsed_command_line.HasSwitch(switches::kLoginPassword)) {
@@ skipping 416 matching lines @@
 #if defined(OS_CHROMEOS)
   // To be precise, logout (browser shutdown) is not yet done, but the
   // remaining work is negligible, hence we say LogoutDone here.
   chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone",
                                                         false);
   chromeos::BootTimesLoader::Get()->WriteLogoutTimes();
 #endif
   TRACE_EVENT_END_ETW("BrowserMain", 0, 0);
   return result_code;
 }