| Index: components/update_client/update_checker.cc
|
| diff --git a/components/component_updater/update_checker.cc b/components/update_client/update_checker.cc
|
| similarity index 85%
|
| rename from components/component_updater/update_checker.cc
|
| rename to components/update_client/update_checker.cc
|
| index f14263c2e946452b3ad4be1c1d94bac796e2545d..9a38a5a4238a362a3939d2e5d0a34510e1d499ef 100644
|
| --- a/components/component_updater/update_checker.cc
|
| +++ b/components/update_client/update_checker.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "components/component_updater/update_checker.h"
|
| +#include "components/update_client/update_checker.h"
|
|
|
| #include <string>
|
| #include <vector>
|
| @@ -16,14 +16,14 @@
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/strings/stringprintf.h"
|
| #include "base/threading/thread_checker.h"
|
| -#include "components/component_updater/component_updater_configurator.h"
|
| -#include "components/component_updater/component_updater_utils.h"
|
| -#include "components/component_updater/crx_update_item.h"
|
| -#include "components/component_updater/request_sender.h"
|
| +#include "components/update_client/configurator.h"
|
| +#include "components/update_client/crx_update_item.h"
|
| +#include "components/update_client/request_sender.h"
|
| +#include "components/update_client/utils.h"
|
| #include "net/url_request/url_fetcher.h"
|
| #include "url/gurl.h"
|
|
|
| -namespace component_updater {
|
| +namespace update_client {
|
|
|
| namespace {
|
|
|
| @@ -48,9 +48,7 @@ std::string BuildUpdateCheckRequest(const Configurator& config,
|
| for (size_t i = 0; i != items.size(); ++i) {
|
| const CrxUpdateItem* item = items[i];
|
| std::string app("<app ");
|
| - base::StringAppendF(&app,
|
| - "appid=\"%s\" version=\"%s\"",
|
| - item->id.c_str(),
|
| + base::StringAppendF(&app, "appid=\"%s\" version=\"%s\"", item->id.c_str(),
|
| item->component.version.GetString().c_str());
|
| if (item->on_demand)
|
| base::StringAppendF(&app, " installsource=\"ondemand\"");
|
| @@ -69,10 +67,8 @@ std::string BuildUpdateCheckRequest(const Configurator& config,
|
| }
|
|
|
| return BuildProtocolRequest(config.GetBrowserVersion().GetString(),
|
| - config.GetChannel(),
|
| - config.GetLang(),
|
| - config.GetOSLongName(),
|
| - app_elements,
|
| + config.GetChannel(), config.GetLang(),
|
| + config.GetOSLongName(), app_elements,
|
| additional_attributes);
|
| }
|
|
|
| @@ -154,8 +150,8 @@ void UpdateCheckerImpl::OnRequestSenderComplete(const net::URLFetcher* source) {
|
| }
|
|
|
| request_sender_.reset();
|
| - update_check_callback_.Run(
|
| - original_url, error, error_message, update_response.results());
|
| + update_check_callback_.Run(original_url, error, error_message,
|
| + update_response.results());
|
| }
|
|
|
| } // namespace
|
| @@ -164,4 +160,4 @@ scoped_ptr<UpdateChecker> UpdateChecker::Create(const Configurator& config) {
|
| return scoped_ptr<UpdateChecker>(new UpdateCheckerImpl(config));
|
| }
|
|
|
| -} // namespace component_updater
|
| +} // namespace update_client
|
|
|