Automate more Better Session Restore tests: Crashes.

chrome/browser/ui/startup/startup_browser_creator.cc

 // Copyright (c) 2012 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/ui/startup/startup_browser_creator.h"
 
 #include <algorithm>   // For max().
 #include <set>
 
 #include "base/bind.h"
@@ skipping 112 matching lines @@
       case chrome::NOTIFICATION_PROFILE_DESTROYED: {
         Profile* profile = content::Source<Profile>(source).ptr();
         launched_profiles.erase(profile);
         break;
       }
       default:
         NOTREACHED();
     }
   }
 
-  bool HasBeenLaunched(const Profile* profile) {
+  bool HasBeenLaunched(const Profile* profile) const {
     return launched_profiles.find(profile) != launched_profiles.end();
   }
 
   void AddLaunched(const Profile* profile) {
     launched_profiles.insert(profile);
   }
 
+  void Clear() {
+    launched_profiles.clear();
+  }
+
  private:
   std::set<const Profile*> launched_profiles;
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileLaunchObserver);
 };
 
 base::LazyInstance<ProfileLaunchObserver> profile_launch_observer =
     LAZY_INSTANCE_INITIALIZER;
 
@@ skipping 109 matching lines @@
   // session which is the default for ChromeOS in general.
   if (chromeos::KioskModeSettings::Get()->IsKioskModeEnabled()) {
     DCHECK(pref.type == SessionStartupPref::LAST);
     pref.type = SessionStartupPref::DEFAULT;
   }
 #endif  // OS_CHROMEOS
 
   return pref;
 }
 
+// static
+void StartupBrowserCreator::ClearLaunchedProfilesForTesting() {
+  profile_launch_observer.Get().Clear();
+}
+
 std::vector<GURL> StartupBrowserCreator::GetURLsFromCommandLine(
     const CommandLine& command_line,
     const FilePath& cur_dir,
     Profile* profile) {
   std::vector<GURL> urls;
   const CommandLine::StringVector& params = command_line.GetArgs();
 
   for (size_t i = 0; i < params.size(); ++i) {
     FilePath param = FilePath(params[i]);
     // Handle Vista way of searching - "? <search-term>"
@@ skipping 302 matching lines @@
     NOTREACHED();
     return;
   }
   ProcessCmdLineImpl(cmd_line, cur_dir, false, profile, Profiles(), NULL, NULL);
 }
 
 bool HasPendingUncleanExit(Profile* profile) {
   return profile->GetLastSessionExitType() == Profile::EXIT_CRASHED &&
       !profile_launch_observer.Get().HasBeenLaunched(profile);
 }