Disable sync promo when RestoreOnStartupURLs policy is used

chrome/browser/ui/webui/sync_promo/sync_promo_ui.cc

Index: chrome/browser/ui/webui/sync_promo/sync_promo_ui.cc
diff --git a/chrome/browser/ui/webui/sync_promo/sync_promo_ui.cc b/chrome/browser/ui/webui/sync_promo/sync_promo_ui.cc
index f269484ae7bcb2d5f77ce8aa6cf4086100c8af6b..a8cb1fdc438e04b09c44a79daaaf64951d383790 100644
--- a/chrome/browser/ui/webui/sync_promo/sync_promo_ui.cc
+++ b/chrome/browser/ui/webui/sync_promo/sync_promo_ui.cc
@@ -172,8 +172,8 @@ bool SyncPromoUI::ShouldShowSyncPromoAtStartup(Profile* profile,
   if (show_count >= kSyncPromoShowAtStartupMaximum)
     return false;
 
-  // This pref can be set in the master preferences file to allow or disallow
-  // showing the sync promo at startup.
+  // Check whether the sync promo has been disabled by a pref. This will always
+  // automatically be the case when the RestoreOnStartupURLs policy is set.

[Mattias Nissler (ping if slow), 2012/05/22 14:58:41]

Please retain the master_preferences reference in the comment.

[bartfab (slow), 2012/05/22 15:30:54]

Done.

   if (prefs->HasPrefPath(prefs::kSyncPromoShowOnFirstRunAllowed))
     return prefs->GetBoolean(prefs::kSyncPromoShowOnFirstRunAllowed);