ProfileManager doesn't depend on "--login-profile" switch.

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 443 matching lines @@
           (candidate->HasOffTheRecordProfile() &&
            candidate->GetOffTheRecordProfile() == profile)) {
         return true;
       }
     }
   }
   return false;
 }
 
 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)) {
-      // TODO(nkostylev): Remove this code completely once we eliminate
-      // legacy --login-profile=user switch and enable multi-profiles on CrOS
-      // by default. http://crbug.com/294628
-      profile_dir = chromeos::ProfileHelper::
-          GetProfileDirByLegacyLoginProfileSwitch();
-    }
-    // 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 =
-        chromeos::ProfileHelper::Get()->active_user_id_hash();
-    if (!user_id_hash.empty())
-      profile_dir = chromeos::ProfileHelper::Get()->GetActiveUserProfileDir();
-
-    relative_profile_dir = relative_profile_dir.Append(profile_dir);
-    return relative_profile_dir;
+    return chromeos::ProfileHelper::Get()->GetActiveUserProfileDir();
   }
 #endif
+  base::FilePath relative_profile_dir;
   // TODO(mirandac): should not automatically be default profile.
-  relative_profile_dir =
-      relative_profile_dir.AppendASCII(chrome::kInitialProfile);
-  return relative_profile_dir;
+  return relative_profile_dir.AppendASCII(chrome::kInitialProfile);
 }
 
 Profile* ProfileManager::GetLastUsedProfile(
     const base::FilePath& user_data_dir) {
 #if defined(OS_CHROMEOS)
   // Use default login profile if user has not logged in yet.
   if (!logged_in_) {
     return GetActiveUserOrOffTheRecordProfileFromPath(user_data_dir);
   } else {
     // CrOS multi-profiles implementation is different so GetLastUsedProfile
@@ skipping 695 matching lines @@
   prefs->SetBoolean(prefs::kEditBookmarksEnabled, false);
   prefs->SetBoolean(prefs::kShowBookmarkBar, false);
   // This can be removed in the future but needs to be present through
   // a release (or two) so that any existing installs get switched to
   // the new state and away from the previous "forced" state.
   IncognitoModePrefs::SetAvailability(prefs, IncognitoModePrefs::ENABLED);
 }
 
 bool ProfileManager::ShouldGoOffTheRecord(Profile* profile) {
 #if defined(OS_CHROMEOS)
-  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-  if (profile->GetPath().BaseName().value() == chrome::kInitialProfile &&
-      (!command_line.HasSwitch(switches::kTestType) ||
-       command_line.HasSwitch(chromeos::switches::kLoginProfile))) {
+  if (profile->GetPath().BaseName().value() == chrome::kInitialProfile) {
     return true;
   }
 #endif
   return profile->IsGuestSession();
 }
 
 void ProfileManager::RunCallbacks(const std::vector<CreateCallback>& callbacks,
                                   Profile* profile,
                                   Profile::CreateStatus status) {
   for (size_t i = 0; i < callbacks.size(); ++i)
@@ skipping 101 matching lines @@
           last_non_supervised_profile_path.BaseName().MaybeAsASCII());
       FinishDeletingProfile(profile_to_delete_path);
     }
   }
 }
 #endif
 
 ProfileManagerWithoutInit::ProfileManagerWithoutInit(
     const base::FilePath& user_data_dir) : ProfileManager(user_data_dir) {
 }