Merge 68872 - Fix sync in Chromium-os by not allowing CanShowPromo to initial...

chrome/browser/web_resource/web_resource_service.cc

Index: chrome/browser/web_resource/web_resource_service.cc
===================================================================
--- chrome/browser/web_resource/web_resource_service.cc	(revision 69725)
+++ chrome/browser/web_resource/web_resource_service.cc	(working copy)
@@ -518,10 +518,14 @@
     }
   }
 
+  // Note that HasProfileSyncService() will be false for ChromeOS, so
+  // promo_options will only be true if the user has an extension installed.
+  // See http://crosbug/10209
   bool promo_options =
-      sync_ui_util::GetStatus(
-          profile->GetProfileSyncService()) == sync_ui_util::SYNCED ||
-          has_extensions;
+      (profile->HasProfileSyncService() &&
+          sync_ui_util::GetStatus(
+              profile->GetProfileSyncService()) == sync_ui_util::SYNCED) ||
+      has_extensions;
 
   return !promo_closed &&
          promo_options &&