Fixed app launcher crashing trying to load guest profile.

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 192 matching lines @@
         time_taken,
         base::TimeDelta::FromSeconds(1),
         base::TimeDelta::FromMinutes(kDiscoverabilityTimeoutMinutes - 1),
         10 /* bucket_count */);
   }
   UMA_HISTOGRAM_ENUMERATION("Apps.AppListHowEnabled",
                             enable_source,
                             AppListService::ENABLE_NUM_ENABLE_SOURCES);
 }
 
+// Checks whether a profile name is valid for the app list. Returns false if the
+// name is empty, or represents a guest profile.
+bool IsValidProfileName(const std::string& profile_name) {
+  if (profile_name.empty())
+    return false;
+
+  return profile_name !=
+         base::FilePath(chrome::kGuestProfileDir).AsUTF8Unsafe();
+}
+
 }  // namespace
 
 void AppListServiceImpl::RecordAppListLaunch() {
   RecordDailyEventFrequency(prefs::kLastAppListLaunchPing,
                             prefs::kAppListLaunchCount,
                             &SendAppListLaunch);
   RecordAppListDiscoverability(local_state_, false);
   RecordAppListLastLaunch();
 }
 
@@ skipping 71 matching lines @@
 
 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 =
+  std::string app_list_profile =
       local_state_->GetString(prefs::kAppListProfile);
-  if (!app_list_profile.empty())
+  if (IsValidProfileName(app_list_profile))
     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();
+  app_list_profile = profile_store_->GetLastUsedProfileName();
+  if (IsValidProfileName(app_list_profile))
+    return app_list_profile;
+
+  // If the last profile used was invalid (ie, guest profile), use the initial
+  // profile.
+  return chrome::kInitialProfile;
 }
 
 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;
@@ skipping 108 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));
 }