Merge 132065 - Modify IsSyncable to only include Internal items and the Chrome Web Store

chrome/common/extensions/extension.cc

Index: chrome/common/extensions/extension.cc
===================================================================
--- chrome/common/extensions/extension.cc	(revision 132783)
+++ chrome/common/extensions/extension.cc	(working copy)
@@ -3516,10 +3516,9 @@
 bool Extension::IsSyncable() const {
   // TODO(akalin): Figure out if we need to allow some other types.
 
-  // We want to sync any extensions that are shown in the launcher because
-  // their positions should sync.
+  // We want to sync any extensions that are internal and the chrome web store.
   return location() == Extension::INTERNAL ||
-      ShouldDisplayInLauncher();
+      id() == extension_misc::kWebStoreAppId;
 }
 
 bool Extension::ShouldDisplayInLauncher() const {