Attempt at fixing flakeyness when running session restore ui tests in...

chrome/browser/browser_init.cc

 // Copyright (c) 2006-2008 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/browser_init.h"
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/event_recorder.h"
 #include "base/histogram.h"
@@ skipping 432 matching lines @@
 
 #if defined(OS_WIN)
     // Look for the testing channel ID ONLY during process startup
     if (command_line.HasSwitch(switches::kTestingChannelID)) {
       std::wstring testing_channel_id =
           command_line.GetSwitchValue(switches::kTestingChannelID);
       // TODO(sanjeevr) Check if we need to make this a singleton for
       // compatibility with the old testing code
       // If there are any loose parameters, we expect each one to generate a
       // new tab; if there are none then we get one homepage tab.
+      int expected_tab_count = 1;
+      if (command_line.HasSwitch(switches::kRestoreLastSession)) {
+        StringToInt(command_line.GetSwitchValue(switches::kRestoreLastSession),
+                    &expected_tab_count);
+      } else {
+        expected_tab_count =
+            std::max(1, static_cast<int>(command_line.GetLooseValues().size()));
+      }
       CreateAutomationProvider<TestingAutomationProvider>(
           testing_channel_id,
           profile,
-          std::max(static_cast<int>(command_line.GetLooseValues().size()),
-                   1));
+          static_cast<size_t>(expected_tab_count));
     }
 #endif
   }
 
   // Allow the command line to override the persisted setting of home page.
   SetOverrideHomePage(command_line, profile->GetPrefs());
 
   if (command_line.HasSwitch(switches::kBrowserStartRenderersManually))
     prefs->transient()->SetBoolean(prefs::kStartRenderersManually, true);
 
@@ skipping 80 matching lines @@
   bool launched = lwp.Launch(profile, process_startup);
   if (!launched) {
     LOG(ERROR) << "launch error";
     if (return_code != NULL)
       *return_code = ResultCodes::INVALID_CMDLINE_URL;
     return false;
   }
 
   return true;
 }