Fix: after updating, restore tabs from all profiles.

chrome/browser/ui/browser_init.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_BROWSER_INIT_H_
 #define CHROME_BROWSER_UI_BROWSER_INIT_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/gtest_prod_util.h"
+#include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/profiles/profile.h"
 #include "googleurl/src/gurl.h"
 
 class Browser;
 class CommandLine;
 class GURL;
 class PrefService;
 class TabContentsWrapper;
 
 // class containing helpers for BrowserMain to spin up a new instance and
@@ skipping 55 matching lines @@
                      const FilePath& cur_dir,
                      IsProcessStartup is_process_startup,
                      IsFirstRun is_first_run,
                      int* return_code);
 
   // When called the first time, reads the value of the preference kWasRestarted
   // and resets it to false. Subsequent calls return the value which was read
   // the first time.
   static bool WasRestarted();
 
+  static SessionStartupPref GetSessionStartupPref(
+      const CommandLine& command_line,
+      Profile* profile);
+
   // LaunchWithProfile ---------------------------------------------------------
   //
   // Assists launching the application and appending the initial tabs for a
   // browser window.
 
   class LaunchWithProfile {
    public:
     // Used by OpenTabsInBrowser.
     struct Tab {
       Tab();
@@ skipping 140 matching lines @@
     const CommandLine& command_line_;
     Profile* profile_;
     BrowserInit* browser_init_;
     bool is_first_run_;
     DISALLOW_COPY_AND_ASSIGN(LaunchWithProfile);
   };
 
  private:
   friend class CloudPrintProxyPolicyTest;
   friend class CloudPrintProxyPolicyStartupTest;
+  FRIEND_TEST_ALL_PREFIXES(BrowserInitTest,
+                           ReadingWasRestartedAfterNormalStart);
+  FRIEND_TEST_ALL_PREFIXES(BrowserInitTest, ReadingWasRestartedAfterRestart);
+  FRIEND_TEST_ALL_PREFIXES(BrowserInitTest, UpdateWithTwoProfiles);
 
   // Returns the list of URLs to open from the command line. The returned
   // vector is empty if the user didn't specify any URLs on the command line.
   static std::vector<GURL> GetURLsFromCommandLine(
       const CommandLine& command_line,
       const FilePath& cur_dir,
       Profile* profile);
 
   static bool ProcessCmdLineImpl(const CommandLine& command_line,
                                  const FilePath& cur_dir,
                                  bool process_startup,
                                  Profile* last_used_profile,
                                  const Profiles& last_opened_profiles,
                                  int* return_code,
                                  BrowserInit* browser_init);
 
   // Callback after a profile has been created.
   static void ProcessCommandLineOnProfileCreated(
       const CommandLine& cmd_line,
       const FilePath& cur_dir,
       Profile* profile,
       Profile::CreateStatus status);
 
   // Additional tabs to open during first run.
   std::vector<GURL> first_run_tabs_;
 
+  // True if we have already read and reset the preference kWasRestarted. (A
+  // member variable instead of a static variable inside WasRestarted because
+  // of testing.)
+  static bool was_restarted_read_;
+
   DISALLOW_COPY_AND_ASSIGN(BrowserInit);
 };
 
 #endif  // CHROME_BROWSER_UI_BROWSER_INIT_H_