diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-15 07:59:56 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-15 07:59:56 +0000 |
| commit | 0dd4f5fa7b9b01132c1b8609f2b9e474544938f0 (patch) | |
| tree | 980120c427f57dc11695ffe390c99c5d84435a5b /chrome/browser/extensions/extension_updater.cc | |
| parent | cc91e16a9b3da5ccf96c4b929b60400be966e9fe (diff) | |
| download | chromium_src-0dd4f5fa7b9b01132c1b8609f2b9e474544938f0.zip chromium_src-0dd4f5fa7b9b01132c1b8609f2b9e474544938f0.tar.gz chromium_src-0dd4f5fa7b9b01132c1b8609f2b9e474544938f0.tar.bz2 | |
Fixed invalid read in ExtensionsServiceTest.ReloadExtensions.
BUG=47843,47863
TEST=unittests, valgrind
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=51215
Review URL: http://codereview.chromium.org/2872024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52461 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_updater.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_updater.cc | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/chrome/browser/extensions/extension_updater.cc b/chrome/browser/extensions/extension_updater.cc index c3b1907..ef064cd 100644 --- a/chrome/browser/extensions/extension_updater.cc +++ b/chrome/browser/extensions/extension_updater.cc @@ -161,7 +161,6 @@ void ManifestFetchesBuilder::AddExtension(const Extension& extension) { AddExtensionData(extension.location(), extension.id(), *extension.version(), - extension.converted_from_user_script(), extension.is_theme(), extension.update_url()); } @@ -175,7 +174,7 @@ void ManifestFetchesBuilder::AddPendingExtension( scoped_ptr<Version> version( Version::GetVersionFromString("0.0.0.0")); AddExtensionData(Extension::INTERNAL, id, *version, - false, info.is_theme, info.update_url); + info.is_theme, info.update_url); } void ManifestFetchesBuilder::ReportStats() const { @@ -209,7 +208,6 @@ void ManifestFetchesBuilder::AddExtensionData( Extension::Location location, const std::string& id, const Version& version, - bool converted_from_user_script, bool is_theme, GURL update_url) { // Only internal and external extensions can be autoupdated. @@ -231,12 +229,6 @@ void ManifestFetchesBuilder::AddExtensionData( return; } - // Skip extensions with empty update URLs converted from user - // scripts. - if (converted_from_user_script && update_url.is_empty()) { - return; - } - if (update_url.DomainIs("google.com")) { url_stats_.google_url_count++; } else if (update_url.is_empty()) { |