Make session restore forced tab load delay Finch configurable, and separate first tab loads from su…

chrome/browser/sessions/tab_loader.cc

 // Copyright 2015 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/tab_loader.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/metrics/histogram.h"
@@ skipping 99 matching lines @@
   // eventually.
   if (delegate_)
     return;
 
   // Create a TabLoaderDelegate which will allow OS specific behavior for tab
   // loading.
   if (!delegate_) {
     delegate_ = TabLoaderDelegate::Create(this);
     // There is already at least one tab loading (the active tab). As such we
     // only have to start the timeout timer here.
-    StartTimer();
+    StartFirstTimer();
   }
 }
 
 void TabLoader::LoadNextTab() {
   // LoadNextTab should only get called after we have started the tab
   // loading.
   CHECK(delegate_);
   if (!tabs_to_load_.empty()) {
     NavigationController* controller = tabs_to_load_.front();
     DCHECK(controller);
@@ skipping 14 matching lines @@
         // the call would do nothing.
         contents->WasHidden();
       }
     }
   }
 
   if (!tabs_to_load_.empty())
     StartTimer();
 }
 
+void TabLoader::StartFirstTimer() {
+  force_load_timer_.Stop();

[gab, 2015/05/15 18:21:02]

Looks like Start() already takes care of stopping a previous timer, so calling
Stop() first seems overkill?

(but I guess it's fine since existing code already does this..)

[chrisha, 2015/05/15 18:47:12]

Acknowledged.

+  force_load_timer_.Start(FROM_HERE,
+                          delegate_->GetFirstTabLoadingTimeout(),
+                          this, &TabLoader::ForceLoadTimerFired);
+}
+
 void TabLoader::StartTimer() {
   force_load_timer_.Stop();
   force_load_timer_.Start(FROM_HERE,
                           delegate_->GetTimeoutBeforeLoadingNextTab() *
                               force_load_delay_multiplier_,
                           this, &TabLoader::ForceLoadTimerFired);
 }
 
 void TabLoader::RemoveTab(NavigationController* controller) {
   registrar_.Remove(this, content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
@@ skipping 53 matching lines @@
     tabs_to_load_.pop_front();
     RemoveTab(controller);
   }
   // By calling |LoadNextTab| explicitly, we make sure that the
   // |NOTIFICATION_SESSION_RESTORE_DONE| event gets sent.
   LoadNextTab();
 }
 
 // static
 TabLoader* TabLoader::shared_tab_loader_ = nullptr;