Make the Chrome Web Store Icon Syncable

chrome/browser/extensions/extension_service.cc

 // Copyright (c) 2012 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/extensions/extension_service.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/basictypes.h"
@@ skipping 1565 matching lines @@
     return true;
 
   // Check the prefs.
   return extension_prefs_->IsIncognitoEnabled(extension_id);
 }
 
 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_EQ(extension_misc::kWebStoreAppId, extension_id);

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

flip argument order (unlike EXPECT_*, should match the natural arg order)

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

Done.

+
+    // If we are here with the CWS, make sure the we aren't trying to
+    // change it.
+    if (extension_id == extension_misc::kWebStoreAppId)

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

i think this if statement is unnecessary; if you're here, you passed the
previous dcheck

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

Done.

+      DCHECK_EQ(IsIncognitoEnabled(extension_id), enabled);
+
     return;
   }
 
   // Broadcast unloaded and loaded events to update browser state. Only bother
   // if the value changed and the extension is actually enabled, since there is
   // no UI otherwise.
   bool old_enabled = extension_prefs_->IsIncognitoEnabled(extension_id);
   if (enabled == old_enabled)
     return;
 
@@ skipping 1104 matching lines @@
   //
   // To coexist with certain unit tests that don't have an IO thread message
   // loop available at ExtensionService shutdown, we lazy-initialize this
   // object so that those cases neither create nor destroy a SocketController.
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (!socket_controller_) {
     socket_controller_ = new extensions::SocketController();
   }
   return socket_controller_;
 }