Make the Chrome Web Store Icon Syncable

Mark the CWS as a syncable app so that it page and app launch ordinals are synced. It also ensure that the CWS has valid ordinals as soon as it it added to the client, instead of waiting until the NTP is shown.

BUG=112290
TEST=Users should be able to move the Chrome Web store icon and have its positions update to other signed in locations.


Review URL: http://codereview.chromium.org/9340007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121310 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/extensions/pending_extension_manager.cc b/chrome/browser/extensions/pending_extension_manager.cc
index 19c1380..85e5705c 100644
--- a/chrome/browser/extensions/pending_extension_manager.cc
+++ b/chrome/browser/extensions/pending_extension_manager.cc
@@ -61,6 +61,14 @@
     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 its values need to be synced) it
+  // should already be installed on every instance.
+  if (id == extension_misc::kWebStoreAppId) {
+    NOTREACHED();
+    return false;
+  }
+
   const bool kIsFromSync = true;
   const Extension::Location kSyncLocation = Extension::INTERNAL;