summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_browsertest.cc
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-12 23:09:16 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-12 23:09:16 +0000
commit6dfbbf8d24de61a5d607a7c0d002dc51584c7bda (patch)
tree071fbd1a7743c8f250ca4f68bbbbed0b53ba4cc1 /chrome/browser/extensions/extension_browsertest.cc
parentc1652ac6c0c9f893368620e4e89ff956693c784a (diff)
downloadchromium_src-6dfbbf8d24de61a5d607a7c0d002dc51584c7bda.zip
chromium_src-6dfbbf8d24de61a5d607a7c0d002dc51584c7bda.tar.gz
chromium_src-6dfbbf8d24de61a5d607a7c0d002dc51584c7bda.tar.bz2
Mechanical refactor of CrxInstaller signatures. This will make
it easier to add additional configuration features to CrxInstaller. Review URL: http://codereview.chromium.org/875003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41503 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_browsertest.cc')
-rw-r--r--chrome/browser/extensions/extension_browsertest.cc17
1 files changed, 8 insertions, 9 deletions
diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc
index 9f7cdcf..7041fab 100644
--- a/chrome/browser/extensions/extension_browsertest.cc
+++ b/chrome/browser/extensions/extension_browsertest.cc
@@ -128,15 +128,14 @@ bool ExtensionBrowserTest::InstallOrUpdateExtension(const std::string& id,
NotificationService::AllSources());
registrar.Add(this, NotificationType::EXTENSION_INSTALL_ERROR,
NotificationService::AllSources());
- CrxInstaller::Start(
- path,
- service->install_directory(),
- Extension::INTERNAL,
- id,
- false, // do not delete after install
- id == "" ? true : false, // only allow privilege increase for installs
- service,
- should_cancel ? new MockAbortExtensionInstallUI() : NULL);
+
+ scoped_refptr<CrxInstaller> installer(
+ new CrxInstaller(
+ service->install_directory(),
+ service,
+ should_cancel ? new MockAbortExtensionInstallUI() : NULL));
+ installer->set_expected_id(id);
+ installer->InstallCrx(path);
MessageLoop::current()->PostDelayedTask(
FROM_HERE, new MessageLoop::QuitTask, kTimeoutMs);