Disable sync promo when RestoreOnStartupURLs policy is used

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 212 matching lines @@
     pref_service->SetBoolean(prefs::kWasRestarted, false);
     was_restarted_read_ = true;
   }
   return was_restarted;
 }
 
 // static
 SessionStartupPref StartupBrowserCreator::GetSessionStartupPref(
     const CommandLine& command_line,
     Profile* profile) {
-  SessionStartupPref pref = SessionStartupPref::GetStartupPref(profile);
+  DCHECK(profile);
+  PrefService *prefs = profile->GetPrefs();
+  SessionStartupPref pref = SessionStartupPref::GetStartupPref(prefs);
 
-  // Session restore should be avoided on the first run.
-  if (first_run::IsChromeFirstRun())
+  // The pref has an OS-dependent default value. For the first run only, this
+  // default is overridden with SessionStartupPref::DEFAULT so that first run
+  // behavior (sync promo, welcome page) is consistently invoked.
+  // This applies only if the pref is still at its default and has not been
+  // set by the user, managed prefs or policy.
+  if (first_run::IsChromeFirstRun() && SessionStartupPref::TypeIsDefault(prefs))
     pref.type = SessionStartupPref::DEFAULT;
 
   if (command_line.HasSwitch(switches::kRestoreLastSession) ||
       StartupBrowserCreator::WasRestarted()) {
     pref.type = SessionStartupPref::LAST;
   }
   if (pref.type == SessionStartupPref::LAST &&
       IncognitoModePrefs::ShouldLaunchIncognito(command_line,
                                                 profile->GetPrefs())) {

[Joao da Silva, 2012/05/23 12:49:46]

Nit: use |prefs| here too. This can probably be collapsed into line 250.

[bartfab (slow), 2012/05/23 12:55:10]

Done.

     // We don't store session information when incognito. If the user has
     // chosen to restore last session and launched incognito, fallback to
     // default launch behavior.
     pref.type = SessionStartupPref::DEFAULT;
   }
   return pref;
 }
 
 std::vector<GURL> StartupBrowserCreator::GetURLsFromCommandLine(
     const CommandLine& command_line,
@@ skipping 313 matching lines @@
     return;
   }
   ProcessCmdLineImpl(cmd_line, cur_dir, false, profile, Profiles(), NULL, NULL);
 }
 
 bool HasPendingUncleanExit(Profile* profile) {
   return !profile->DidLastSessionExitCleanly() &&
     !profile_launch_observer.Get().HasBeenLaunched(profile);
 }