Reworked ExtensionsService::AddPendingExtension().

chrome/browser/sync/glue/extension_model_associator.cc

 // Copyright (c) 2010 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/sync/glue/extension_model_associator.h"
 
 #include <map>
 #include <utility>
 
 #include "base/logging.h"
@@ skipping 367 matching lines @@
           specifics, extension_specifics))
           << ExtensionSpecificsToString(specifics) << ", "
           << ExtensionSpecificsToString(extension_specifics);
     }
     if (!IsExtensionOutdated(*extension, specifics)) {
       extension_data->ResolveData(ExtensionData::CLIENT);
       DCHECK(!extension_data->NeedsUpdate(ExtensionData::CLIENT));
     }
   } 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));
 }
 
 void ExtensionModelAssociator::NudgeExtensionUpdater() {
   ExtensionUpdater* extension_updater = GetExtensionsService()->updater();
   // Auto-updates should now be on always (see the construction of the
   // ExtensionsService in ProfileImpl::InitExtensions()).
   if (extension_updater) {
     extension_updater->CheckNow();
   } else {
     LOG(DFATAL) << "Extension updater unexpectedly NULL; "
                 << "auto-updates may be turned off";
   }
 }
 
 }  // namespace browser_sync