Skip to content

GitLab

T
tangled
Commit 692512f9 authored by Swapnil's avatar Swapnil Committed by Commit Bot
Browse files
Options

Refactor ManifestFetchData 

Change AddExtension method in ManifestFetchData class so that it
accepts the Manifest::Location instead of std::string as we would need
it in case of offline installation from cache in
https://crbug.com/1051870.

Bug: 1061402
Change-Id: I336e240d659095f94796d3aec06c51f4b577d6ca
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2100820
Commit-Queue: Swapnil Gupta <swapnilgupta@google.com>
Reviewed-by: default avatarDevlin <rdevlin.cronin@chromium.org>
Reviewed-by: default avatarOleg Davydov <burunduk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#751177}
parent 432fefd5
Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 45 deletions
chrome/browser/extensions/updater/extension_updater_unittest.cc
View file @ 692512f9
...@@ -696,7 +696,7 @@ class ExtensionUpdaterTest : public testing::Test { ...@@ -696,7 +696,7 @@ class ExtensionUpdaterTest : public testing::Test {
std::unique_ptr<ManifestFetchData> fetch_data( std::unique_ptr<ManifestFetchData> fetch_data(
CreateManifestFetchData(GURL("http://localhost/foo"))); CreateManifestFetchData(GURL("http://localhost/foo")));
fetch_data->AddExtension(id, version, &kNeverPingedData, std::string(), fetch_data->AddExtension(id, version, &kNeverPingedData, std::string(),
std::string(), std::string(), std::string(), Manifest::Location::INTERNAL,
ManifestFetchData::FetchPriority::BACKGROUND); ManifestFetchData::FetchPriority::BACKGROUND);
std::map<std::string, std::string> params; std::map<std::string, std::string> params;
...@@ -715,7 +715,7 @@ class ExtensionUpdaterTest : public testing::Test { ...@@ -715,7 +715,7 @@ class ExtensionUpdaterTest : public testing::Test {
std::unique_ptr<ManifestFetchData> fetch_data( std::unique_ptr<ManifestFetchData> fetch_data(
CreateManifestFetchData(GURL("http://localhost/foo"))); CreateManifestFetchData(GURL("http://localhost/foo")));
fetch_data->AddExtension(id, version, &kNeverPingedData, "bar", fetch_data->AddExtension(id, version, &kNeverPingedData, "bar",
std::string(), std::string(), std::string(), Manifest::Location::INTERNAL,
ManifestFetchData::FetchPriority::BACKGROUND); ManifestFetchData::FetchPriority::BACKGROUND);
std::map<std::string, std::string> params; std::map<std::string, std::string> params;
VerifyQueryAndExtractParameters(fetch_data->full_url().query(), &params); VerifyQueryAndExtractParameters(fetch_data->full_url().query(), &params);
...@@ -733,7 +733,7 @@ class ExtensionUpdaterTest : public testing::Test { ...@@ -733,7 +733,7 @@ class ExtensionUpdaterTest : public testing::Test {
std::unique_ptr<ManifestFetchData> fetch_data( std::unique_ptr<ManifestFetchData> fetch_data(
CreateManifestFetchData(GURL("http://localhost/foo"))); CreateManifestFetchData(GURL("http://localhost/foo")));
fetch_data->AddExtension(id, version, &kNeverPingedData, "a=1&b=2&c", fetch_data->AddExtension(id, version, &kNeverPingedData, "a=1&b=2&c",
std::string(), std::string(), std::string(), Manifest::Location::INTERNAL,
ManifestFetchData::FetchPriority::BACKGROUND); ManifestFetchData::FetchPriority::BACKGROUND);
std::map<std::string, std::string> params; std::map<std::string, std::string> params;
VerifyQueryAndExtractParameters(fetch_data->full_url().query(), &params); VerifyQueryAndExtractParameters(fetch_data->full_url().query(), &params);
...@@ -837,7 +837,8 @@ class ExtensionUpdaterTest : public testing::Test { ...@@ -837,7 +837,8 @@ class ExtensionUpdaterTest : public testing::Test {
std::unique_ptr<ManifestFetchData> fetch_data( std::unique_ptr<ManifestFetchData> fetch_data(
CreateManifestFetchData(GURL("http://localhost/foo"))); CreateManifestFetchData(GURL("http://localhost/foo")));
fetch_data->AddExtension(id, version, &kNeverPingedData, fetch_data->AddExtension(id, version, &kNeverPingedData,
kEmptyUpdateUrlData, install_source, std::string(), kEmptyUpdateUrlData, install_source,
Manifest::Location::INTERNAL,
ManifestFetchData::FetchPriority::BACKGROUND); ManifestFetchData::FetchPriority::BACKGROUND);
std::map<std::string, std::string> params; std::map<std::string, std::string> params;
VerifyQueryAndExtractParameters(fetch_data->full_url().query(), &params); VerifyQueryAndExtractParameters(fetch_data->full_url().query(), &params);
...@@ -854,9 +855,10 @@ class ExtensionUpdaterTest : public testing::Test { ...@@ -854,9 +855,10 @@ class ExtensionUpdaterTest : public testing::Test {
// Make sure that installedby= appears in the x= parameter. // Make sure that installedby= appears in the x= parameter.
std::unique_ptr<ManifestFetchData> fetch_data( std::unique_ptr<ManifestFetchData> fetch_data(
CreateManifestFetchData(GURL("http://localhost/foo"))); CreateManifestFetchData(GURL("http://localhost/foo")));
fetch_data->AddExtension( fetch_data->AddExtension(id, version, &kNeverPingedData,
id, version, &kNeverPingedData, kEmptyUpdateUrlData, std::string(), kEmptyUpdateUrlData, std::string(),
install_location, ManifestFetchData::FetchPriority::BACKGROUND); Manifest::Location::EXTERNAL_PREF_DOWNLOAD,
ManifestFetchData::FetchPriority::BACKGROUND);
std::map<std::string, std::string> params; std::map<std::string, std::string> params;
VerifyQueryAndExtractParameters(fetch_data->full_url().query(), &params); VerifyQueryAndExtractParameters(fetch_data->full_url().query(), &params);
EXPECT_EQ(id, params["id"]); EXPECT_EQ(id, params["id"]);
...@@ -886,11 +888,13 @@ class ExtensionUpdaterTest : public testing::Test { ...@@ -886,11 +888,13 @@ class ExtensionUpdaterTest : public testing::Test {
const std::string id1 = crx_file::id_util::GenerateId("1"); const std::string id1 = crx_file::id_util::GenerateId("1");
const std::string id2 = crx_file::id_util::GenerateId("2"); const std::string id2 = crx_file::id_util::GenerateId("2");
fetch_data->AddExtension(id1, "1.0.0.0", &kNeverPingedData, fetch_data->AddExtension(id1, "1.0.0.0", &kNeverPingedData,
kEmptyUpdateUrlData, std::string(), std::string(), kEmptyUpdateUrlData, std::string(),
Manifest::Location::INTERNAL,
ManifestFetchData::FetchPriority::BACKGROUND); ManifestFetchData::FetchPriority::BACKGROUND);
AddParseResult(id1, "1.1", "http://localhost/e1_1.1.crx", &updates); AddParseResult(id1, "1.1", "http://localhost/e1_1.1.crx", &updates);
fetch_data->AddExtension(id2, "2.0.0.0", &kNeverPingedData, fetch_data->AddExtension(id2, "2.0.0.0", &kNeverPingedData,
kEmptyUpdateUrlData, std::string(), std::string(), kEmptyUpdateUrlData, std::string(),
Manifest::Location::INTERNAL,
ManifestFetchData::FetchPriority::BACKGROUND); ManifestFetchData::FetchPriority::BACKGROUND);
AddParseResult(id2, "2.0.0.0", "http://localhost/e2_2.0.crx", &updates); AddParseResult(id2, "2.0.0.0", "http://localhost/e2_2.0.crx", &updates);
...@@ -935,32 +939,38 @@ class ExtensionUpdaterTest : public testing::Test { ...@@ -935,32 +939,38 @@ class ExtensionUpdaterTest : public testing::Test {
const std::string id6 = crx_file::id_util::GenerateId("6"); const std::string id6 = crx_file::id_util::GenerateId("6");
fetch_data->AddExtension(id1, "1.0.0.0", &kNeverPingedData, fetch_data->AddExtension(id1, "1.0.0.0", &kNeverPingedData,
kEmptyUpdateUrlData, std::string(), std::string(), kEmptyUpdateUrlData, std::string(),
Manifest::Location::INTERNAL,
ManifestFetchData::FetchPriority::BACKGROUND); ManifestFetchData::FetchPriority::BACKGROUND);
AddParseResult(id1, "1.1", "http://localhost/e1_1.1.crx", &updates); AddParseResult(id1, "1.1", "http://localhost/e1_1.1.crx", &updates);
fetch_data->AddExtension(id2, "2.0.0.0", &kNeverPingedData, fetch_data->AddExtension(id2, "2.0.0.0", &kNeverPingedData,
kEmptyUpdateUrlData, std::string(), std::string(), kEmptyUpdateUrlData, std::string(),
Manifest::Location::INTERNAL,
ManifestFetchData::FetchPriority::BACKGROUND); ManifestFetchData::FetchPriority::BACKGROUND);
AddParseResult(id2, "2.0.0.0", "http://localhost/e2_2.0.crx", &updates); AddParseResult(id2, "2.0.0.0", "http://localhost/e2_2.0.crx", &updates);
fetch_data->AddExtension(id3, "0.0.0.0", &kNeverPingedData, fetch_data->AddExtension(id3, "0.0.0.0", &kNeverPingedData,
kEmptyUpdateUrlData, std::string(), std::string(), kEmptyUpdateUrlData, std::string(),
Manifest::Location::INTERNAL,
ManifestFetchData::FetchPriority::BACKGROUND); ManifestFetchData::FetchPriority::BACKGROUND);
// Empty update version in manifest. // Empty update version in manifest.
AddParseResult(id3, "", "http://localhost/e3_3.0.crx", &updates); AddParseResult(id3, "", "http://localhost/e3_3.0.crx", &updates);
fetch_data->AddExtension(id4, "0.0.0.0", &kNeverPingedData, fetch_data->AddExtension(id4, "0.0.0.0", &kNeverPingedData,
kEmptyUpdateUrlData, std::string(), std::string(), kEmptyUpdateUrlData, std::string(),
Manifest::Location::INTERNAL,
ManifestFetchData::FetchPriority::BACKGROUND); ManifestFetchData::FetchPriority::BACKGROUND);
fetch_data->AddExtension(id5, "0.0.0.0", &kNeverPingedData, fetch_data->AddExtension(id5, "0.0.0.0", &kNeverPingedData,
kEmptyUpdateUrlData, std::string(), std::string(), kEmptyUpdateUrlData, std::string(),
Manifest::Location::INTERNAL,
ManifestFetchData::FetchPriority::BACKGROUND); ManifestFetchData::FetchPriority::BACKGROUND);
AddParseResult(id5, "5.0.0.0", "http://localhost/e5_5.0.crx", &updates); AddParseResult(id5, "5.0.0.0", "http://localhost/e5_5.0.crx", &updates);
fetch_data->AddExtension(id6, "0.0.0.0", &kNeverPingedData, fetch_data->AddExtension(id6, "0.0.0.0", &kNeverPingedData,
kEmptyUpdateUrlData, std::string(), std::string(), kEmptyUpdateUrlData, std::string(),
Manifest::Location::INTERNAL,
ManifestFetchData::FetchPriority::BACKGROUND); ManifestFetchData::FetchPriority::BACKGROUND);
// Invalid update version in manifest. // Invalid update version in manifest.
AddParseResult(id6, "invalid_version", "http://localhost/e6_6.0.crx", AddParseResult(id6, "invalid_version", "http://localhost/e6_6.0.crx",
...@@ -1008,9 +1018,10 @@ class ExtensionUpdaterTest : public testing::Test { ...@@ -1008,9 +1018,10 @@ class ExtensionUpdaterTest : public testing::Test {
&ids_for_update_check); &ids_for_update_check);
for (const std::string& id : ids_for_update_check) { for (const std::string& id : ids_for_update_check) {
fetch_data->AddExtension( fetch_data->AddExtension(id, "1.0.0.0", &kNeverPingedData,
id, "1.0.0.0", &kNeverPingedData, kEmptyUpdateUrlData, std::string(), kEmptyUpdateUrlData, std::string(),
std::string(), ManifestFetchData::FetchPriority::BACKGROUND); Manifest::Location::INTERNAL,
ManifestFetchData::FetchPriority::BACKGROUND);
AddParseResult(id, "1.1", "http://localhost/e1_1.1.crx", &updates); AddParseResult(id, "1.1", "http://localhost/e1_1.1.crx", &updates);
} }
...@@ -1045,25 +1056,32 @@ class ExtensionUpdaterTest : public testing::Test { ...@@ -1045,25 +1056,32 @@ class ExtensionUpdaterTest : public testing::Test {
std::unique_ptr<ManifestFetchData> fetch_data( std::unique_ptr<ManifestFetchData> fetch_data(
CreateManifestFetchData(GURL("http://localhost/foo"))); CreateManifestFetchData(GURL("http://localhost/foo")));
fetch_data->AddExtension(id1, "1.1.0.0", &kNeverPingedData, fetch_data->AddExtension(id1, "1.1.0.0", &kNeverPingedData,
kEmptyUpdateUrlData, std::string(), std::string(), kEmptyUpdateUrlData, std::string(),
Manifest::Location::INTERNAL,
ManifestFetchData::FetchPriority::BACKGROUND); ManifestFetchData::FetchPriority::BACKGROUND);
fetch_data->AddExtension(id2, "1.2.0.0", &kNeverPingedData, fetch_data->AddExtension(id2, "1.2.0.0", &kNeverPingedData,
kEmptyUpdateUrlData, std::string(), std::string(), kEmptyUpdateUrlData, std::string(),
Manifest::Location::INTERNAL,
ManifestFetchData::FetchPriority::BACKGROUND); ManifestFetchData::FetchPriority::BACKGROUND);
fetch_data->AddExtension(id3, "1.3.0.0", &kNeverPingedData, fetch_data->AddExtension(id3, "1.3.0.0", &kNeverPingedData,
kEmptyUpdateUrlData, std::string(), std::string(), kEmptyUpdateUrlData, std::string(),
Manifest::Location::INTERNAL,
ManifestFetchData::FetchPriority::BACKGROUND); ManifestFetchData::FetchPriority::BACKGROUND);
fetch_data->AddExtension(id4, "1.4.0.0", &kNeverPingedData, fetch_data->AddExtension(id4, "1.4.0.0", &kNeverPingedData,
kEmptyUpdateUrlData, std::string(), std::string(), kEmptyUpdateUrlData, std::string(),
Manifest::Location::INTERNAL,
ManifestFetchData::FetchPriority::BACKGROUND); ManifestFetchData::FetchPriority::BACKGROUND);
fetch_data->AddExtension(id5, "1.5.0.0", &kNeverPingedData, fetch_data->AddExtension(id5, "1.5.0.0", &kNeverPingedData,
kEmptyUpdateUrlData, std::string(), std::string(), kEmptyUpdateUrlData, std::string(),
Manifest::Location::INTERNAL,
ManifestFetchData::FetchPriority::BACKGROUND); ManifestFetchData::FetchPriority::BACKGROUND);
fetch_data->AddExtension(id6, "1.6.0.0", &kNeverPingedData, fetch_data->AddExtension(id6, "1.6.0.0", &kNeverPingedData,
kEmptyUpdateUrlData, std::string(), std::string(), kEmptyUpdateUrlData, std::string(),
Manifest::Location::INTERNAL,
ManifestFetchData::FetchPriority::BACKGROUND); ManifestFetchData::FetchPriority::BACKGROUND);
fetch_data->AddExtension(id7, "1.7.0.0", &kNeverPingedData, fetch_data->AddExtension(id7, "1.7.0.0", &kNeverPingedData,
kEmptyUpdateUrlData, std::string(), std::string(), kEmptyUpdateUrlData, std::string(),
Manifest::Location::INTERNAL,
ManifestFetchData::FetchPriority::BACKGROUND); ManifestFetchData::FetchPriority::BACKGROUND);
UpdateManifestResults updates; UpdateManifestResults updates;
...@@ -1122,16 +1140,16 @@ class ExtensionUpdaterTest : public testing::Test { ...@@ -1122,16 +1140,16 @@ class ExtensionUpdaterTest : public testing::Test {
CreateManifestFetchData(kUpdateUrl)); CreateManifestFetchData(kUpdateUrl));
ManifestFetchData::PingData zeroDays(0, 0, true, 0); ManifestFetchData::PingData zeroDays(0, 0, true, 0);
fetch1->AddExtension("1111", "1.0", &zeroDays, kEmptyUpdateUrlData, fetch1->AddExtension("1111", "1.0", &zeroDays, kEmptyUpdateUrlData,
std::string(), std::string(), std::string(), Manifest::Location::INTERNAL,
ManifestFetchData::FetchPriority::BACKGROUND); ManifestFetchData::FetchPriority::BACKGROUND);
fetch2->AddExtension("2222", "2.0", &zeroDays, kEmptyUpdateUrlData, fetch2->AddExtension("2222", "2.0", &zeroDays, kEmptyUpdateUrlData,
std::string(), std::string(), std::string(), Manifest::Location::INTERNAL,
ManifestFetchData::FetchPriority::BACKGROUND); ManifestFetchData::FetchPriority::BACKGROUND);
fetch3->AddExtension("3333", "3.0", &zeroDays, kEmptyUpdateUrlData, fetch3->AddExtension("3333", "3.0", &zeroDays, kEmptyUpdateUrlData,
std::string(), std::string(), std::string(), Manifest::Location::INTERNAL,
ManifestFetchData::FetchPriority::BACKGROUND); ManifestFetchData::FetchPriority::BACKGROUND);
fetch4->AddExtension("4444", "4.0", &zeroDays, kEmptyUpdateUrlData, fetch4->AddExtension("4444", "4.0", &zeroDays, kEmptyUpdateUrlData,
std::string(), std::string(), std::string(), Manifest::Location::INTERNAL,
ManifestFetchData::FetchPriority::BACKGROUND); ManifestFetchData::FetchPriority::BACKGROUND);
// This will start the first fetcher and queue the others. The next in queue // This will start the first fetcher and queue the others. The next in queue
...@@ -1257,7 +1275,7 @@ class ExtensionUpdaterTest : public testing::Test { ...@@ -1257,7 +1275,7 @@ class ExtensionUpdaterTest : public testing::Test {
CreateManifestFetchData(kUpdateUrl)); CreateManifestFetchData(kUpdateUrl));
ManifestFetchData::PingData zeroDays(0, 0, true, 0); ManifestFetchData::PingData zeroDays(0, 0, true, 0);
fetch->AddExtension("1111", "1.0", &zeroDays, kEmptyUpdateUrlData, fetch->AddExtension("1111", "1.0", &zeroDays, kEmptyUpdateUrlData,
std::string(), std::string(), std::string(), Manifest::Location::INTERNAL,
ManifestFetchData::FetchPriority::BACKGROUND); ManifestFetchData::FetchPriority::BACKGROUND);
// This will start the first fetcher. // This will start the first fetcher.
...@@ -1291,7 +1309,7 @@ class ExtensionUpdaterTest : public testing::Test { ...@@ -1291,7 +1309,7 @@ class ExtensionUpdaterTest : public testing::Test {
// should not retry. // should not retry.
fetch.reset(CreateManifestFetchData(kUpdateUrl)); fetch.reset(CreateManifestFetchData(kUpdateUrl));
fetch->AddExtension("1111", "1.0", &zeroDays, kEmptyUpdateUrlData, fetch->AddExtension("1111", "1.0", &zeroDays, kEmptyUpdateUrlData,
std::string(), std::string(), std::string(), Manifest::Location::INTERNAL,
ManifestFetchData::FetchPriority::BACKGROUND); ManifestFetchData::FetchPriority::BACKGROUND);
// This will start the first fetcher. // This will start the first fetcher.
...@@ -1337,7 +1355,7 @@ class ExtensionUpdaterTest : public testing::Test { ...@@ -1337,7 +1355,7 @@ class ExtensionUpdaterTest : public testing::Test {
CreateManifestFetchData(kUpdateUrl)); CreateManifestFetchData(kUpdateUrl));
ManifestFetchData::PingData zeroDays(0, 0, true, 0); ManifestFetchData::PingData zeroDays(0, 0, true, 0);
fetch->AddExtension("1111", "1.0", &zeroDays, kEmptyUpdateUrlData, fetch->AddExtension("1111", "1.0", &zeroDays, kEmptyUpdateUrlData,
std::string(), std::string(), std::string(), Manifest::Location::INTERNAL,
ManifestFetchData::FetchPriority::BACKGROUND); ManifestFetchData::FetchPriority::BACKGROUND);
helper.downloader().StartUpdateCheck(std::move(fetch)); helper.downloader().StartUpdateCheck(std::move(fetch));
...@@ -1366,7 +1384,7 @@ class ExtensionUpdaterTest : public testing::Test { ...@@ -1366,7 +1384,7 @@ class ExtensionUpdaterTest : public testing::Test {
CreateManifestFetchData(kUpdateUrl)); CreateManifestFetchData(kUpdateUrl));
ManifestFetchData::PingData zeroDays(0, 0, true, 0); ManifestFetchData::PingData zeroDays(0, 0, true, 0);
fetch->AddExtension("1111", "1.0", &zeroDays, kEmptyUpdateUrlData, fetch->AddExtension("1111", "1.0", &zeroDays, kEmptyUpdateUrlData,
std::string(), std::string(), std::string(), Manifest::Location::INTERNAL,
ManifestFetchData::FetchPriority::BACKGROUND); ManifestFetchData::FetchPriority::BACKGROUND);
helper.downloader().StartUpdateCheck(std::move(fetch)); helper.downloader().StartUpdateCheck(std::move(fetch));
...@@ -2039,7 +2057,7 @@ class ExtensionUpdaterTest : public testing::Test { ...@@ -2039,7 +2057,7 @@ class ExtensionUpdaterTest : public testing::Test {
const Extension* extension = tmp[0].get(); const Extension* extension = tmp[0].get();
fetch_data->AddExtension(extension->id(), extension->VersionString(), fetch_data->AddExtension(extension->id(), extension->VersionString(),
&kNeverPingedData, kEmptyUpdateUrlData, &kNeverPingedData, kEmptyUpdateUrlData,
std::string(), std::string(), std::string(), Manifest::Location::INTERNAL,
ManifestFetchData::FetchPriority::BACKGROUND); ManifestFetchData::FetchPriority::BACKGROUND);
auto results = std::make_unique<UpdateManifestResults>(); auto results = std::make_unique<UpdateManifestResults>();
constexpr int kDaystartElapsedSeconds = 750; constexpr int kDaystartElapsedSeconds = 750;
...@@ -2064,9 +2082,9 @@ class ExtensionUpdaterTest : public testing::Test { ...@@ -2064,9 +2082,9 @@ class ExtensionUpdaterTest : public testing::Test {
std::unique_ptr<ManifestFetchData> fetch_data( std::unique_ptr<ManifestFetchData> fetch_data(
CreateManifestFetchData(GURL("http://localhost/foo"), data_priority)); CreateManifestFetchData(GURL("http://localhost/foo"), data_priority));
ASSERT_TRUE(fetch_data->AddExtension(id, version, &kNeverPingedData, ASSERT_TRUE(fetch_data->AddExtension(
std::string(), std::string(), id, version, &kNeverPingedData, std::string(), std::string(),
std::string(), extension_priority)); Manifest::Location::INTERNAL, extension_priority));
ASSERT_EQ(expected_priority, fetch_data->fetch_priority()); ASSERT_EQ(expected_priority, fetch_data->fetch_priority());
} }
......
extensions/browser/updater/extension_downloader.cc
View file @ 692512f9
...@@ -396,9 +396,6 @@ bool ExtensionDownloader::AddExtensionData( ...@@ -396,9 +396,6 @@ bool ExtensionDownloader::AddExtensionData(
if (extra.is_corrupt_reinstall) if (extra.is_corrupt_reinstall)
install_source = kReinstallInstallSource; install_source = kReinstallInstallSource;
const std::string install_location =
ManifestFetchData::GetSimpleLocationString(extension_location);
ManifestFetchData::PingData ping_data; ManifestFetchData::PingData ping_data;
ManifestFetchData::PingData* optional_ping_data = NULL; ManifestFetchData::PingData* optional_ping_data = NULL;
if (delegate_->GetPingDataForExtension(id, &ping_data)) if (delegate_->GetPingDataForExtension(id, &ping_data))
...@@ -414,7 +411,7 @@ bool ExtensionDownloader::AddExtensionData( ...@@ -414,7 +411,7 @@ bool ExtensionDownloader::AddExtensionData(
ManifestFetchData* existing_fetch = existing_iter->second.back().get(); ManifestFetchData* existing_fetch = existing_iter->second.back().get();
if (existing_fetch->AddExtension( if (existing_fetch->AddExtension(
id, version.GetString(), optional_ping_data, extra.update_url_data, id, version.GetString(), optional_ping_data, extra.update_url_data,
install_source, install_location, fetch_priority)) { install_source, extension_location, fetch_priority)) {
added = true; added = true;
} }
} }
...@@ -428,7 +425,7 @@ bool ExtensionDownloader::AddExtensionData( ...@@ -428,7 +425,7 @@ bool ExtensionDownloader::AddExtensionData(
std::move(fetch)); std::move(fetch));
added = fetch_ptr->AddExtension(id, version.GetString(), optional_ping_data, added = fetch_ptr->AddExtension(id, version.GetString(), optional_ping_data,
extra.update_url_data, install_source, extra.update_url_data, install_source,
install_location, fetch_priority); extension_location, fetch_priority);
DCHECK(added); DCHECK(added);
} }
......
extensions/browser/updater/extension_downloader_unittest.cc
View file @ 692512f9
...@@ -45,7 +45,8 @@ class ExtensionDownloaderTest : public ExtensionsTest { ...@@ -45,7 +45,8 @@ class ExtensionDownloaderTest : public ExtensionsTest {
std::unique_ptr<ManifestFetchData> fetch( std::unique_ptr<ManifestFetchData> fetch(
CreateManifestFetchData(kUpdateUrl)); CreateManifestFetchData(kUpdateUrl));
ManifestFetchData::PingData zero_days(0, 0, true, 0); ManifestFetchData::PingData zero_days(0, 0, true, 0);
fetch->AddExtension(kTestExtensionId, "1.0", &zero_days, "", "", "", fetch->AddExtension(kTestExtensionId, "1.0", &zero_days, "", "",
Manifest::Location::INTERNAL,
ManifestFetchData::FetchPriority::BACKGROUND); ManifestFetchData::FetchPriority::BACKGROUND);
return fetch; return fetch;
} }
......
extensions/browser/updater/manifest_fetch_data.cc
View file @ 692512f9
...@@ -126,7 +126,7 @@ bool ManifestFetchData::AddExtension(const std::string& id, ...@@ -126,7 +126,7 @@ bool ManifestFetchData::AddExtension(const std::string& id,
const PingData* ping_data, const PingData* ping_data,
const std::string& update_url_data, const std::string& update_url_data,
const std::string& install_source, const std::string& install_source,
const std::string& install_location, Manifest::Location extension_location,
FetchPriority fetch_priority) { FetchPriority fetch_priority) {
if (extension_ids_.find(id) != extension_ids_.end()) { if (extension_ids_.find(id) != extension_ids_.end()) {
NOTREACHED() << "Duplicate extension id " << id; NOTREACHED() << "Duplicate extension id " << id;
...@@ -137,6 +137,9 @@ bool ManifestFetchData::AddExtension(const std::string& id, ...@@ -137,6 +137,9 @@ bool ManifestFetchData::AddExtension(const std::string& id,
fetch_priority_ = fetch_priority; fetch_priority_ = fetch_priority;
} }
const std::string install_location =
GetSimpleLocationString(extension_location);
// Compute the string we'd append onto the full_url_, and see if it fits. // Compute the string we'd append onto the full_url_, and see if it fits.
std::vector<std::string> parts; std::vector<std::string> parts;
parts.push_back("id=" + id); parts.push_back("id=" + id);
......
extensions/browser/updater/manifest_fetch_data.h
View file @ 692512f9
...@@ -103,7 +103,7 @@ class ManifestFetchData { ...@@ -103,7 +103,7 @@ class ManifestFetchData {
const PingData* ping_data, const PingData* ping_data,
const std::string& update_url_data, const std::string& update_url_data,
const std::string& install_source, const std::string& install_source,
const std::string& install_location, Manifest::Location install_location,
FetchPriority fetch_priority); FetchPriority fetch_priority);
const GURL& base_url() const { return base_url_; } const GURL& base_url() const { return base_url_; }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment