Reworked ExtensionsService::AddPendingExtension().

chrome/browser/sync/glue/extension_model_associator.cc

Index: chrome/browser/sync/glue/extension_model_associator.cc
diff --git a/chrome/browser/sync/glue/extension_model_associator.cc b/chrome/browser/sync/glue/extension_model_associator.cc
index d8200b2a7b9b80ecaf13d21c6ead7aa30338a438..8a339511265407bb91e443d4752a4b240212c14a 100644
--- a/chrome/browser/sync/glue/extension_model_associator.cc
+++ b/chrome/browser/sync/glue/extension_model_associator.cc
@@ -385,23 +385,11 @@ void ExtensionModelAssociator::TryUpdateClient(
     }
   } else {
     GURL update_url(specifics.update_url());
-    // TODO(akalin): The version number should be used only to
-    // determine auto-updating permissions, not to send to the
-    // auto-update server.
-    scoped_ptr<Version> version(
-        Version::GetVersionFromString("0.0.0.0"));
-    CHECK(version.get());
     // TODO(akalin): Replace silent update with a list of enabled
     // permissions.
-    //
-    // TODO(akalin): Pass through the enabled/incognito_enabled state.
-    // We can't do it on OnClientUpdate() because we'd run into
-    // problems with triggering notifications while we're in a
-    // notification handler.  The bug that this causes is that syncing
-    // a fresh client (i.e., no extensions) re-enables disabled
-    // extensions.
     extensions_service->AddPendingExtension(
-        id, update_url, *version, false, true);
+        id, update_url, false, true,
+        specifics.enabled(), specifics.incognito_enabled());
   }
   DCHECK(!extension_data->NeedsUpdate(ExtensionData::SERVER));
 }