The name manifest is overload in the context of CRXs and update.
In this case, the code is parsing update responses, and precise
naming improves the readability and undestanding of the code.
This also avoids a conflict with similar names in the extension updater.
Similar file names even if they are in different directories can break
some gyp targets (https://code.google.com/p/gyp/issues/detail?id=384)
GYP_GENERATORS set to 'ninja'
Updating projects from gyp files...
Using overrides found in /include.gypi
static library src/clank/src/chrome/chrome.gyp:unit_tests#target has several files with the same basename:
update_manifest_unittest: browser/component_updater/test/update_manifest_unittest.cc common/extensions/update_manifest_unittest.cc
Some build systems, e.g. MSVC08, cannot handle that.
gyp: Duplicate basenames in sources section, see list above
BUG=314521
Review URL: https://codereview.chromium.org/87413002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237470 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/component_updater/component_updater_service.cc b/chrome/browser/component_updater/component_updater_service.cc
index beee14a..774a21bc 100644
--- a/chrome/browser/component_updater/component_updater_service.cc
+++ b/chrome/browser/component_updater/component_updater_service.cc
@@ -29,7 +29,7 @@
#include "chrome/browser/component_updater/component_updater_ping_manager.h"
#include "chrome/browser/component_updater/component_updater_utils.h"
#include "chrome/browser/component_updater/crx_update_item.h"
-#include "chrome/browser/component_updater/update_manifest.h"
+#include "chrome/browser/component_updater/update_response.h"
#include "chrome/common/chrome_version_info.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/resource_controller.h"
@@ -307,9 +307,9 @@
kStepDelayLong,
};
- void OnParseUpdateManifestSucceeded(
- const component_updater::UpdateManifest::Results& results);
- void OnParseUpdateManifestFailed(const std::string& error_message);
+ void OnParseUpdateResponseSucceeded(
+ const component_updater::UpdateResponse::Results& results);
+ void OnParseUpdateResponseFailed(const std::string& error_message);
Status OnDemandUpdateInternal(CrxUpdateItem* item);
@@ -328,7 +328,7 @@
void ScheduleNextRun(StepDelayInterval step_delay);
- void ParseManifest(const std::string& xml);
+ void ParseResponse(const std::string& xml);
void Install(const CRXContext* context, const base::FilePath& crx_path);
@@ -847,32 +847,32 @@
std::string xml;
source->GetResponseAsString(&xml);
url_fetcher_.reset();
- ParseManifest(xml);
+ ParseResponse(xml);
} else {
url_fetcher_.reset();
- CrxUpdateService::OnParseUpdateManifestFailed("network error");
+ CrxUpdateService::OnParseUpdateResponseFailed("network error");
}
delete context;
}
-void CrxUpdateService::ParseManifest(const std::string& xml) {
+void CrxUpdateService::ParseResponse(const std::string& xml) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- component_updater::UpdateManifest manifest;
- if (manifest.Parse(xml))
- CrxUpdateService::OnParseUpdateManifestSucceeded(manifest.results());
+ component_updater::UpdateResponse update_response;
+ if (update_response.Parse(xml))
+ CrxUpdateService::OnParseUpdateResponseSucceeded(update_response.results());
else
- CrxUpdateService::OnParseUpdateManifestFailed(manifest.errors());
+ CrxUpdateService::OnParseUpdateResponseFailed(update_response.errors());
}
// A valid Omaha update check has arrived, from only the list of components that
// we are currently upgrading we check for a match in which the server side
// version is newer, if so we queue them for an upgrade. The next time we call
// ProcessPendingItems() one of them will be drafted for the upgrade process.
-void CrxUpdateService::OnParseUpdateManifestSucceeded(
- const component_updater::UpdateManifest::Results& results) {
+void CrxUpdateService::OnParseUpdateResponseSucceeded(
+ const component_updater::UpdateResponse::Results& results) {
size_t num_updates_pending = 0;
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- std::vector<component_updater::UpdateManifest::Result>::const_iterator it;
+ std::vector<component_updater::UpdateResponse::Result>::const_iterator it;
for (it = results.list.begin(); it != results.list.end(); ++it) {
CrxUpdateItem* crx = FindUpdateItemById(it->extension_id);
if (!crx)
@@ -913,7 +913,7 @@
crx->next_version = Version(it->manifest.version);
typedef component_updater::
- UpdateManifest::Result::Manifest::Package Package;
+ UpdateResponse::Result::Manifest::Package Package;
const Package& package(it->manifest.packages[0]);
crx->next_fp = package.fingerprint;
@@ -937,7 +937,7 @@
ScheduleNextRun(num_updates_pending > 0 ? kStepDelayShort : kStepDelayMedium);
}
-void CrxUpdateService::OnParseUpdateManifestFailed(
+void CrxUpdateService::OnParseUpdateResponseFailed(
const std::string& error_message) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
size_t count = ChangeItemStatus(CrxUpdateItem::kChecking,
