Refactor how events are being handled in UpdateClient.
This is a mechanical change.
BUG=687231
Review-Url: https://codereview.chromium.org/2888403003
Cr-Commit-Position: refs/heads/master@{#473041}
diff --git a/components/update_client/component.cc b/components/update_client/component.cc
index ec2b940..dec191d 100644
--- a/components/update_client/component.cc
+++ b/components/update_client/component.cc
@@ -17,6 +17,7 @@
#include "base/threading/thread_task_runner_handle.h"
#include "components/update_client/component_unpacker.h"
#include "components/update_client/configurator.h"
+#include "components/update_client/protocol_builder.h"
#include "components/update_client/update_client.h"
#include "components/update_client/update_client_errors.h"
#include "components/update_client/update_engine.h"
@@ -251,10 +252,8 @@
update_context_.config->EnabledBackgroundDownloader();
}
-void Component::AppendDownloadMetrics(
- const std::vector<CrxDownloader::DownloadMetrics>& download_metrics) {
- download_metrics_.insert(download_metrics_.end(), download_metrics.begin(),
- download_metrics.end());
+void Component::AppendEvent(const std::string& event) {
+ events_.push_back(event);
}
void Component::NotifyObservers(UpdateClient::Observer::Events event) const {
@@ -366,6 +365,11 @@
DCHECK(thread_checker_.CalledOnValidThread());
auto& component = State::component();
+
+ // Create an event only when the server response included an update.
+ if (component.IsUpdateAvailable())
+ component.AppendEvent(BuildUpdateCompleteEventElement(component));
+
TransitionState(nullptr);
component.NotifyObservers(Events::COMPONENT_NOT_UPDATED);
}
@@ -475,7 +479,8 @@
auto& component = Component::State::component();
- component.AppendDownloadMetrics(crx_downloader_->download_metrics());
+ for (const auto& metrics : crx_downloader_->download_metrics())
+ component.AppendEvent(BuildDownloadCompleteEventElement(metrics));
crx_downloader_.reset();
@@ -541,7 +546,8 @@
auto& component = Component::State::component();
- component.AppendDownloadMetrics(crx_downloader_->download_metrics());
+ for (const auto& metrics : crx_downloader_->download_metrics())
+ component.AppendEvent(BuildDownloadCompleteEventElement(metrics));
crx_downloader_.reset();
@@ -681,6 +687,8 @@
component.crx_component_.version = component.next_version_;
component.crx_component_.fingerprint = component.next_fp_;
+ component.AppendEvent(BuildUpdateCompleteEventElement(component));
+
TransitionState(nullptr);
component.NotifyObservers(Events::COMPONENT_UPDATED);
}
@@ -696,6 +704,10 @@
void Component::StateUninstalled::DoHandle() {
DCHECK(thread_checker_.CalledOnValidThread());
+
+ auto& component = State::component();
+ component.AppendEvent(BuildUninstalledEventElement(component));
+
TransitionState(nullptr);
}
