Don't create a new profile when cleaning up stale ephemeral profiles.

chrome/browser/ui/app_list/app_list_service_impl.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/ui/app_list/app_list_service_impl.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 113 matching lines @@
 
   Profile* GetProfileByPath(const base::FilePath& path) override {
     DCHECK(!IsProfileLocked(path));
     return profile_manager_->GetProfileByPath(path);
   }
 
   base::FilePath GetUserDataDir() override {
     return profile_manager_->user_data_dir();
   }
 
+  std::string GetLastUsedProfileName() override {
+    return profile_manager_->GetLastUsedProfileName();
+  }
+
   bool IsProfileSupervised(const base::FilePath& profile_path) override {
     ProfileInfoCache& profile_info =
         g_browser_process->profile_manager()->GetProfileInfoCache();
     size_t profile_index = profile_info.GetIndexOfProfileWithPath(profile_path);
     return profile_index != std::string::npos &&
         profile_info.ProfileIsSupervisedAtIndex(profile_index);
   }
 
   bool IsProfileLocked(const base::FilePath& profile_path) override {
     ProfileInfoCache& profile_info =
@@ skipping 134 matching lines @@
   view_delegate_->SetProfile(profile);
   return view_delegate_.get();
 }
 
 void AppListServiceImpl::SetAppListNextPaintCallback(void (*callback)()) {}
 
 void AppListServiceImpl::Init(Profile* initial_profile) {}
 
 base::FilePath AppListServiceImpl::GetProfilePath(
     const base::FilePath& user_data_dir) {
-  std::string app_list_profile;
-  if (local_state_->HasPrefPath(prefs::kAppListProfile))
-    app_list_profile = local_state_->GetString(prefs::kAppListProfile);
-
-  // If the user has no profile preference for the app launcher, default to the
-  // last browser profile used.
-  if (app_list_profile.empty() &&
-      local_state_->HasPrefPath(prefs::kProfileLastUsed)) {
-    app_list_profile = local_state_->GetString(prefs::kProfileLastUsed);
-  }
-
-  // If there is no last used profile recorded, use the initial profile.
-  if (app_list_profile.empty())
-    app_list_profile = chrome::kInitialProfile;
-
-  return user_data_dir.AppendASCII(app_list_profile);
+  return user_data_dir.AppendASCII(GetProfileName());
 }
 
 void AppListServiceImpl::SetProfilePath(const base::FilePath& profile_path) {
   local_state_->SetString(
       prefs::kAppListProfile,
       profile_path.BaseName().MaybeAsASCII());
 }
 
 void AppListServiceImpl::CreateShortcut() {}
 
+std::string AppListServiceImpl::GetProfileName() {
+  const std::string app_list_profile =
+      local_state_->GetString(prefs::kAppListProfile);
+  if (!app_list_profile.empty())
+    return app_list_profile;
+
+  // If the user has no profile preference for the app launcher, default to the
+  // last browser profile used.
+  return profile_store_->GetLastUsedProfileName();
+}
+
 void AppListServiceImpl::OnProfileWillBeRemoved(
     const base::FilePath& profile_path) {
   // We need to watch for profile removal to keep kAppListProfile updated, for
   // the case that the deleted profile is being used by the app list.
   std::string app_list_last_profile = local_state_->GetString(
       prefs::kAppListProfile);
   if (profile_path.BaseName().MaybeAsASCII() != app_list_last_profile)
     return;
 
   // Switch the app list over to a valid profile.
@@ skipping 106 matching lines @@
   if (!base::MessageLoop::current())
     return;  // In a unit test.
 
   // Send app list usage stats after a delay.
   const int kSendUsageStatsDelay = 5;
   base::MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&AppListServiceImpl::SendAppListStats),
       base::TimeDelta::FromSeconds(kSendUsageStatsDelay));
 }