Reworked ExtensionsService::AddPendingExtension().

chrome/browser/sync/glue/theme_util.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/theme_util.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
@@ skipping 109 matching lines @@
       // just set the current theme to it.
       profile->SetTheme(extension);
       // Pretend the theme was just installed.
       ExtensionInstallUI::ShowThemeInfoBar(
           previous_theme_id, previous_use_system_theme,
           extension, profile);
     } else {
       // No extension with this id exists -- we must install it; we do
       // so by adding it as a pending extension and then triggering an
       // auto-update cycle.
-      scoped_ptr<Version> version(Version::GetVersionFromString("0.0.0.0"));
-      DCHECK(version.get());
       const bool kIsTheme = true;
       // Themes don't need to install silently as they just pop up an
       // informational dialog after installation instead of a
       // confirmation dialog.
       const bool kInstallSilently = false;
-      extensions_service->AddPendingExtension(id, update_url, *version,
-                                              kIsTheme, kInstallSilently);
+      const bool kEnableOnInstall = true;
+      const bool kEnableIncognitoOnInstall = false;
+      extensions_service->AddPendingExtension(
+          id, update_url, kIsTheme, kInstallSilently,
+          kEnableOnInstall, kEnableIncognitoOnInstall);
       ExtensionUpdater* extension_updater = extensions_service->updater();
       // Auto-updates should now be on always (see the construction of
       // the ExtensionsService in ProfileImpl::InitExtensions()).
       if (!extension_updater) {
         LOG(DFATAL) << "Extension updater unexpectedly NULL; "
                     << "auto-updates may be turned off";
         return;
       }
       extension_updater->CheckNow();
     }
@@ skipping 51 matching lines @@
     const sync_pb::ThemeSpecifics& theme_specifics, Profile* profile) {
   DCHECK(profile);
   sync_pb::ThemeSpecifics old_theme_specifics;
   GetThemeSpecificsFromCurrentTheme(profile, &old_theme_specifics);
   if (!AreThemeSpecificsEqual(old_theme_specifics, theme_specifics)) {
     SetCurrentThemeFromThemeSpecifics(theme_specifics, profile);
   }
 }
 
 }  // namespace browser_sync