Rewritten MountLibrary to work with non-blocking mount API calls in libcros....

chrome/browser/sessions/session_restore.cc

Index: chrome/browser/sessions/session_restore.cc
===================================================================
--- chrome/browser/sessions/session_restore.cc	(revision 78219)
+++ chrome/browser/sessions/session_restore.cc	(working copy)
@@ -653,8 +653,13 @@
 
     // Record an app launch, if applicable.
     GURL url = tab.navigations.at(tab.current_navigation_index).virtual_url();
+#if defined(OS_CHROMEOS)
+    if (browser->profile()->GetExtensionService() &&
+        browser->profile()->GetExtensionService()->IsInstalledApp(url)) {
+#else
     DCHECK(browser->profile()->GetExtensionService());
     if (browser->profile()->GetExtensionService()->IsInstalledApp(url)) {
+#endif

[stevenjb, 2011/03/16 22:52:55]

Maybe only do the DCHECK for non OS_CHROMEOS and make the logic the same for
both?

[zel, 2011/03/17 01:00:30]

This solves the crash that affects our debugging, DCHECK won't do the trick
here.

[stevenjb, 2011/03/17 01:30:37]

I meant to suggest leaving the DCHECK in for non-chromeos only, but have the
extra if() check for both.
This is fine as-is though.

       UMA_HISTOGRAM_ENUMERATION(extension_misc::kAppLaunchHistogram,
                                 extension_misc::APP_LAUNCH_SESSION_RESTORE,
                                 extension_misc::APP_LAUNCH_BUCKET_BOUNDARY);