Chromium Code Reviews| Index: chrome/browser/ui/ash/chrome_launcher_prefs.cc |
| diff --git a/chrome/browser/ui/ash/chrome_launcher_prefs.cc b/chrome/browser/ui/ash/chrome_launcher_prefs.cc |
| index c57d1cd8a3d2c802bf3961c257972b8f822fc6ab..674dbbe3871711fe8a6e6ef39e4195d114a0e57f 100644 |
| --- a/chrome/browser/ui/ash/chrome_launcher_prefs.cc |
| +++ b/chrome/browser/ui/ash/chrome_launcher_prefs.cc |
| @@ -598,8 +598,8 @@ std::vector<AppLauncherId> GetPinnedAppsFromPrefs( |
| LauncherControllerHelper* helper) { |
| app_list::AppListSyncableService* app_service = |
| app_list::AppListSyncableServiceFactory::GetForProfile(helper->profile()); |
| - // Some unit tests may not have it. |
| - if (!app_service) |
| + // Some unit tests may not have it or service may not be initialized. |
| + if (!app_service || !app_service->IsInited()) |
|
khmel
2016/10/25 15:49:00
To Steven: Another race condition which is hard to
stevenjb
2016/10/25 16:21:32
Acknowledged.
|
| return std::vector<AppLauncherId>(); |
| std::vector<PinInfo> pin_infos; |