Delete tab_loader when there are no more tabs to be loaded or painted

chrome/browser/sessions/session_restore.cc

 // Copyright (c) 2010 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 303 matching lines @@
           // to an already existing browser and an existing tab painted.
           got_first_paint_ = true;
         }
       }
       break;
     }
     default:
       NOTREACHED() << "Unknown notification received:" << type.value;
   }
   // Delete ourselves when we're not waiting for any more notifications.
-  if (got_first_paint_&& tabs_loading_.empty() && tabs_to_load_.empty())
+  if ((got_first_paint_ || render_widget_hosts_to_paint_.empty()) &&
+      tabs_loading_.empty() && tabs_to_load_.empty())
     delete this;
 }
 
 void TabLoader::RemoveTab(NavigationController* tab) {
   registrar_.Remove(this, NotificationType::TAB_CONTENTS_DESTROYED,
                     Source<TabContents>(tab->tab_contents()));
   registrar_.Remove(this, NotificationType::LOAD_STOP,
                     Source<NavigationController>(tab));
   registrar_.Remove(this, NotificationType::LOAD_START,
                     Source<NavigationController>(tab));
@@ skipping 479 matching lines @@
 void SessionRestore::RestoreSessionSynchronously(
     Profile* profile,
     const std::vector<GURL>& urls_to_open) {
   Restore(profile, NULL, true, false, true, urls_to_open);
 }
 
 // static
 bool SessionRestore::IsRestoring() {
   return restoring;
 }