summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_browsertest.cc
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-25 01:36:40 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-25 01:36:40 +0000
commitf3113e238e6a127ca42099c9413cc0c32db1120c (patch)
treee67dda2e3999acc08abaf508f9814f3d2e67b471 /chrome/browser/extensions/extension_browsertest.cc
parenta6ae341e9c13a377e7defbde0c41d29bd6a6184e (diff)
downloadchromium_src-f3113e238e6a127ca42099c9413cc0c32db1120c.zip
chromium_src-f3113e238e6a127ca42099c9413cc0c32db1120c.tar.gz
chromium_src-f3113e238e6a127ca42099c9413cc0c32db1120c.tar.bz2
Reworked ExtensionsService::AddPendingExtension().
Made it take options for enabled/incognito enabled state to apply on install. BUG=46515 TEST=unittests, manual (newly-synced disabled extensions should stay disabled) Review URL: http://codereview.chromium.org/2819023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50804 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_browsertest.cc')
-rw-r--r--chrome/browser/extensions/extension_browsertest.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc
index ce0f37d..d3494da 100644
--- a/chrome/browser/extensions/extension_browsertest.cc
+++ b/chrome/browser/extensions/extension_browsertest.cc
@@ -81,7 +81,8 @@ bool ExtensionBrowserTest::LoadExtensionImpl(const FilePath& path,
// OnExtensionInstalled ensures the other extension prefs are set up with
// the defaults.
Extension* extension = service->extensions()->at(num_after - 1);
- service->extension_prefs()->OnExtensionInstalled(extension);
+ service->extension_prefs()->OnExtensionInstalled(
+ extension, Extension::ENABLED, false);
service->SetIsIncognitoEnabled(extension, true);
}