Make the Chrome Web Store Icon Syncable

chrome/browser/extensions/pending_extension_manager.cc

Index: chrome/browser/extensions/pending_extension_manager.cc
diff --git a/chrome/browser/extensions/pending_extension_manager.cc b/chrome/browser/extensions/pending_extension_manager.cc
index 19c1380be354cccfeca0d9e5d020a8a0fcaf6c5f..fea07b7c5b32d16713603dde065f462cb64bd982 100644
--- a/chrome/browser/extensions/pending_extension_manager.cc
+++ b/chrome/browser/extensions/pending_extension_manager.cc
@@ -61,6 +61,14 @@ bool PendingExtensionManager::AddFromSync(
     return false;
   }
 
+  // Make sure we don't ever try to install the CWS app, because even though
+  // it is listed as a syncable app (because it values need to be synced) it
+  // should already be installed on every instance.
+  if (extension_misc::kWebStoreAppId == id) {

[akalin, 2012/02/03 01:44:43]

flip argument order

[csharp, 2012/02/03 14:57:04]

Done.

+    NOTREACHED();
+    return false;
+  }
+
   const bool kIsFromSync = true;
   const Extension::Location kSyncLocation = Extension::INTERNAL;