| Index: components/update_client/crx_downloader.cc
|
| diff --git a/components/component_updater/crx_downloader.cc b/components/update_client/crx_downloader.cc
|
| similarity index 88%
|
| rename from components/component_updater/crx_downloader.cc
|
| rename to components/update_client/crx_downloader.cc
|
| index b56b3972fa538ba28c938462e3b70b089c622750..ecbf301d8bd0a00cc57eed2300b16cf288b59bd4 100644
|
| --- a/components/component_updater/crx_downloader.cc
|
| +++ b/components/update_client/crx_downloader.cc
|
| @@ -2,18 +2,18 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "components/component_updater/crx_downloader.h"
|
| +#include "components/update_client/crx_downloader.h"
|
|
|
| #include "base/logging.h"
|
| #include "base/sequenced_task_runner.h"
|
| #include "base/single_thread_task_runner.h"
|
| -#include "components/component_updater/url_fetcher_downloader.h"
|
| +#include "components/update_client/url_fetcher_downloader.h"
|
|
|
| #if defined(OS_WIN)
|
| -#include "components/component_updater/background_downloader_win.h"
|
| +#include "components/update_client/background_downloader_win.h"
|
| #endif
|
|
|
| -namespace component_updater {
|
| +namespace update_client {
|
|
|
| CrxDownloader::Result::Result()
|
| : error(0), downloaded_bytes(-1), total_bytes(-1) {
|
| @@ -36,12 +36,11 @@ CrxDownloader* CrxDownloader::Create(
|
| scoped_refptr<base::SingleThreadTaskRunner> background_task_runner) {
|
| scoped_ptr<CrxDownloader> url_fetcher_downloader(
|
| new UrlFetcherDownloader(scoped_ptr<CrxDownloader>().Pass(),
|
| - context_getter,
|
| - url_fetcher_task_runner));
|
| + context_getter, url_fetcher_task_runner));
|
| #if defined(OS_WIN)
|
| if (is_background_download) {
|
| - return new BackgroundDownloader(
|
| - url_fetcher_downloader.Pass(), context_getter, background_task_runner);
|
| + return new BackgroundDownloader(url_fetcher_downloader.Pass(),
|
| + context_getter, background_task_runner);
|
| }
|
| #endif
|
|
|
| @@ -70,8 +69,8 @@ CrxDownloader::download_metrics() const {
|
| return download_metrics_;
|
|
|
| std::vector<DownloadMetrics> retval(successor_->download_metrics());
|
| - retval.insert(
|
| - retval.begin(), download_metrics_.begin(), download_metrics_.end());
|
| + retval.insert(retval.begin(), download_metrics_.begin(),
|
| + download_metrics_.end());
|
| return retval;
|
| }
|
|
|
| @@ -155,4 +154,4 @@ void CrxDownloader::OnDownloadProgress(const Result& result) {
|
| progress_callback_.Run(result);
|
| }
|
|
|
| -} // namespace component_updater
|
| +} // namespace update_client
|
|
|