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..13622dd8aaa2f6249fefd2eff12c71b086ca6dd2 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -1583,8 +1583,14 @@ 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).

[Finnur, 2012/02/03 15:12:52]

nit: consider->considered.

[csharp, 2012/02/03 15:19:20]

Done.

+    DCHECK_EQ(extension_id, extension_misc::kWebStoreAppId);
+
+    // If we are here with the CWS, make sure the we aren't trying to
+    // change it.
+    DCHECK_EQ(enabled, IsIncognitoEnabled(extension_id));
+
     return;
   }