Make the Chrome Web Store Icon Syncable

chrome/browser/extensions/extension_service.cc

Index: chrome/browser/extensions/extension_service.cc
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index 6fe5f1eb5e33ce1b4fc0e7410b12ce650183f979..e033bcb88881ebac15747f8427a2829179e492b3 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -1583,8 +1583,9 @@ void ExtensionService::SetIsIncognitoEnabled(
     const std::string& extension_id, bool enabled) {
   const Extension* extension = GetInstalledExtension(extension_id);
   if (extension && extension->location() == Extension::COMPONENT) {
-    // This shouldn't be called for component extensions.
-    NOTREACHED();
+    // This shouldn't be called for component extensions other than the
+    // web store (which is consider an app, and may try to set this value).
+    DCHECK(extension_id == extension_misc::kWebStoreAppId);

[akalin, 2012/02/02 01:17:46]

DCHECK_EQ

[akalin, 2012/02/02 01:17:46]

if id == web store id, perhaps dcheck that enabled == false?

[csharp, 2012/02/02 15:26:18]

DCHECK_EQ added.

I think the other dcheck should be that enabled == IsIncognitoEnabled. Basically
just making sure that we aren't trying to modify the value. (By default the CWS
app has enabled=true)

     return;
   }