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

chrome/browser/sessions/session_restore.cc

 // Copyright (c) 2011 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/sessions/session_restore.h"
 
 #include <algorithm>
 #include <list>
 #include <set>
 #include <vector>
@@ skipping 635 matching lines @@
                   bool schedule_load) {
     DCHECK(!tab.navigations.empty());
     int selected_index = tab.current_navigation_index;
     selected_index = std::max(
         0,
         std::min(selected_index,
                  static_cast<int>(tab.navigations.size() - 1)));
 
     // 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);
     }
 
     TabContents* tab_contents =
         browser->AddRestoredTab(tab.navigations,
                                 tab_index,
                                 selected_index,
                                 tab.extension_app_id,
@@ skipping 168 matching lines @@
 Browser* SessionRestore::RestoreSessionSynchronously(
     Profile* profile,
     const std::vector<GURL>& urls_to_open) {
   return Restore(profile, NULL, true, false, true, urls_to_open);
 }
 
 // static
 bool SessionRestore::IsRestoring() {
   return restoring;
 }