Fix non-otr profile's file manager being launched in guest mode.

chrome/browser/ui/app_list/app_list_syncable_service.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_syncable_service.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
@@ skipping 103 matching lines @@
   // For now, use the AppListControllerDelegate associated with the native
   // desktop. TODO(stevenjb): Remove ExtensionAppModelBuilder controller
   // dependency and move the dependent methods from AppListControllerDelegate
   // to an extension service delegate associated with this class.
   AppListControllerDelegate* controller = NULL;
   AppListService* service =
       AppListService::Get(chrome::HOST_DESKTOP_TYPE_NATIVE);
   if (service)
     controller = service->GetControllerDelegate();
   apps_builder_.reset(new ExtensionAppModelBuilder(controller));
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
+  DCHECK(profile_);
+  if (!profile_->IsOffTheRecord() &&

[stevenjb, 2013/12/26 22:34:17]

Hmm, I guess this is OK for now. Eventually we will want to remove the switch
and combine the Initialize methods; we'll have to make certain they can deal
with OTR profiles at that point for Guest login. Could you add a comment here:
TODO(stevenjb): Correctly handle OTR profiles for Guest mode.

[tbarzic, 2013/12/27 22:35:38]

Done.

+      CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableSyncAppList)) {
     DVLOG(1) << this << ": AppListSyncableService: InitializeWithService.";
     SyncStarted();
     apps_builder_->InitializeWithService(this);
   } else {
     DVLOG(1) << this << ": AppListSyncableService: InitializeWithProfile.";
     apps_builder_->InitializeWithProfile(profile_, model_.get());
   }
-
-  DCHECK(profile_);
 }
 
 void AppListSyncableService::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK_EQ(chrome::NOTIFICATION_EXTENSIONS_READY, type);
   DCHECK_EQ(profile_, content::Source<Profile>(source).ptr());
   registrar_.RemoveAll();
   BuildModel();
@@ skipping 307 matching lines @@
   delete iter->second;
   sync_items_.erase(iter);
   model_->item_list()->DeleteItem(item_id);
 }
 
 std::string AppListSyncableService::SyncItem::ToString() const {
   return item_id.substr(0, 8) + " [" + item_ordinal.ToDebugString() + "]";
 }
 
 }  // namespace app_list