| Index: chrome/test/base/chrome_unit_test_suite.cc
|
| diff --git a/chrome/test/base/chrome_unit_test_suite.cc b/chrome/test/base/chrome_unit_test_suite.cc
|
| index 434257679a6b16fbd678b499512a484fde8afb0b..c78d463eed706df8b95261d58c78dc69ac546ed4 100644
|
| --- a/chrome/test/base/chrome_unit_test_suite.cc
|
| +++ b/chrome/test/base/chrome_unit_test_suite.cc
|
| @@ -8,15 +8,15 @@
|
| #include "base/process/process_handle.h"
|
| #include "base/strings/stringprintf.h"
|
| #include "chrome/browser/chrome_content_browser_client.h"
|
| -#include "chrome/browser/omaha_client/chrome_omaha_query_params_delegate.h"
|
| +#include "chrome/browser/update_client/chrome_update_query_params_delegate.h"
|
| #include "chrome/common/chrome_content_client.h"
|
| #include "chrome/common/chrome_paths.h"
|
| #include "chrome/test/base/testing_browser_process.h"
|
| #include "chrome/utility/chrome_content_utility_client.h"
|
| #include "components/component_updater/component_updater_paths.h"
|
| -#include "components/omaha_client/omaha_query_params.h"
|
| #include "components/translate/content/browser/browser_cld_data_provider_factory.h"
|
| #include "components/translate/content/common/cld_data_source.h"
|
| +#include "components/update_client/update_query_params.h"
|
| #include "content/public/common/content_paths.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
| @@ -49,7 +49,7 @@ class ChromeUnitTestSuiteInitializer : public testing::EmptyTestEventListener {
|
| ChromeUnitTestSuiteInitializer() {}
|
| virtual ~ChromeUnitTestSuiteInitializer() {}
|
|
|
| - virtual void OnTestStart(const testing::TestInfo& test_info) override {
|
| + void OnTestStart(const testing::TestInfo& test_info) override {
|
| content_client_.reset(new ChromeContentClient);
|
| content::SetContentClient(content_client_.get());
|
| // TODO(ios): Bring this back once ChromeContentBrowserClient is building.
|
| @@ -63,7 +63,7 @@ class ChromeUnitTestSuiteInitializer : public testing::EmptyTestEventListener {
|
| TestingBrowserProcess::CreateInstance();
|
| }
|
|
|
| - virtual void OnTestEnd(const testing::TestInfo& test_info) override {
|
| + void OnTestEnd(const testing::TestInfo& test_info) override {
|
| // TODO(ios): Bring this back once ChromeContentBrowserClient is building.
|
| #if !defined(OS_IOS)
|
| browser_content_client_.reset();
|
| @@ -149,8 +149,8 @@ void ChromeUnitTestSuite::InitializeProviders() {
|
|
|
| gfx::GLSurface::InitializeOneOffForTests();
|
|
|
| - omaha_client::OmahaQueryParams::SetDelegate(
|
| - ChromeOmahaQueryParamsDelegate::GetInstance());
|
| + update_client::UpdateQueryParams::SetDelegate(
|
| + ChromeUpdateQueryParamsDelegate::GetInstance());
|
| #endif
|
| }
|
|
|
|
|