Remove bogus DCHECK for retail startup pages.

chrome/browser/ui/startup/startup_browser_creator.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/ui/startup/startup_browser_creator.h"
 
 #include <algorithm>   // For max().
 #include <set>
 
 #include "apps/app_load_service.h"
@@ skipping 346 matching lines @@
   }
   if (pref.type == SessionStartupPref::LAST &&
       IncognitoModePrefs::ShouldLaunchIncognito(command_line, prefs)) {
     // We don't store session information when incognito. If the user has
     // chosen to restore last session and launched incognito, fallback to
     // default launch behavior.
     pref.type = SessionStartupPref::DEFAULT;
   }
 
 #if defined(OS_CHROMEOS)
-  // Kiosk/Retail mode has no profile to restore and fails to open the tabs
-  // specified in the startup_urls policy if we try to restore the non-existent
-  // session which is the default for ChromeOS in general.
+  // Kiosk/Retail mode receives startup URLs through device settings. They are
+  // appended to the command line, which requires type DEFAULT to work.
   if (chromeos::KioskModeSettings::Get()->IsKioskModeEnabled()) {

[pastarmovj, 2013/09/27 15:48:25]

No need for { }.

[Mattias Nissler (ping if slow), 2013/09/27 15:52:13]

Done.

-    DCHECK(pref.type == SessionStartupPref::LAST);
     pref.type = SessionStartupPref::DEFAULT;
   }
 #endif  // OS_CHROMEOS
 
   return pref;
 }
 
 // static
 void StartupBrowserCreator::ClearLaunchedProfilesForTesting() {
   profile_launch_observer.Get().Clear();
@@ skipping 363 matching lines @@
 
 // static
 bool StartupBrowserCreator::ActivatedProfile() {
   return profile_launch_observer.Get().activated_profile();
 }
 
 bool HasPendingUncleanExit(Profile* profile) {
   return profile->GetLastSessionExitType() == Profile::EXIT_CRASHED &&
       !profile_launch_observer.Get().HasBeenLaunched(profile);
 }