Remove bogus DCHECK for retail startup pages.

chrome/browser/ui/startup/startup_browser_creator.cc

Index: chrome/browser/ui/startup/startup_browser_creator.cc
diff --git a/chrome/browser/ui/startup/startup_browser_creator.cc b/chrome/browser/ui/startup/startup_browser_creator.cc
index f23794bd8623d3bd597757e09cfded7615d85c66..65f1d50222ea6a54b7f1b926a1f357027dc8b97d 100644
--- a/chrome/browser/ui/startup/startup_browser_creator.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator.cc
@@ -364,13 +364,10 @@ SessionStartupPref StartupBrowserCreator::GetSessionStartupPref(
   }
 
 #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.
-  if (chromeos::KioskModeSettings::Get()->IsKioskModeEnabled()) {
-    DCHECK(pref.type == SessionStartupPref::LAST);
+  // 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())
     pref.type = SessionStartupPref::DEFAULT;

[sky, 2013/09/27 17:01:15]

Why is it a problem to restore the last session here? I see you comment, but
that reads as though the bug is session restore not handling additional urls,
which it should.

[Mattias Nissler (ping if slow), 2013/09/27 17:07:30]

I don't know TBH. Julian, can you please comment?

[pastarmovj, 2013/09/30 08:53:33]

When the new smarter session restore was implemented it ignores the urls added
to the command line at least on ChromeOS. I can remember I discussed this with
Marja and I was convinced back then that it was not a bug but a feature and
therefore the check was put here instead. However I will add her to comment why
was this so because I don't remember myself anymore.

[marja, 2013/09/30 11:30:06]

Hmm.

1) If your startup pref is "last", and you pass command line URLs, chrome
*should* open both the last open tabs and the command line URLs. This works on
Linux just fine. Does this not work on ChromeOS?

2) However, the comment in the deleted part of the code talks about
*startup_urls policy*. To me this sounds like the startup pref should be "open
these specified urls" in this case. Why is it not?

I find it suspicious that this CL changes the comment which explains why this
line of code is needed ;)

[Mattias Nissler (ping if slow), 2013/09/30 12:03:58]

FWIW, I didn't change any code, just trying to get rid of a consistently failing
DCHECK and adjusting a comment to be actually helpful. The fact that nobody
seems to know what's going on here is a telltale sign for the previous comment
not being helpful. If the new comment is not accurate, then the entire logic
here probably doesn't make sense. If that's the conclusion, I can also just file
a bug against pastarmovj@ to find out what's really needed here. 

-  }
 #endif  // OS_CHROMEOS
 
   return pref;