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

chrome/browser/web_resource/web_resource_service.cc

 // Copyright (c) 2010 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/web_resource/web_resource_service.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/string_util.h"
 #include "base/string_number_conversions.h"
@@ skipping 500 matching lines @@
     for (ExtensionList::const_iterator iter = extensions->begin();
          iter != extensions->end();
          ++iter) {
       if ((*iter)->location() == Extension::INTERNAL) {
         has_extensions = true;
         break;
       }
     }
   }
 
+  // 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 &&
          g_browser_process->GetApplicationLocale() == "en-US";
 }
 
 }  // namespace WebResourceService