| Index: chrome/browser/profile_resetter/resettable_settings_snapshot.cc
|
| diff --git a/chrome/browser/profile_resetter/resettable_settings_snapshot.cc b/chrome/browser/profile_resetter/resettable_settings_snapshot.cc
|
| index da825508c93646f182b78ebe06907fe6e4bf9e66..7abc383b7cc4e00fe5243f8bad93c24ce41004ff 100644
|
| --- a/chrome/browser/profile_resetter/resettable_settings_snapshot.cc
|
| +++ b/chrome/browser/profile_resetter/resettable_settings_snapshot.cc
|
| @@ -13,14 +13,15 @@
|
| #include "chrome/browser/browser_process.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/search_engines/template_url_service_factory.h"
|
| +#include "chrome/common/channel_info.h"
|
| #include "chrome/common/chrome_content_client.h"
|
| -#include "chrome/common/chrome_version_info.h"
|
| #include "chrome/common/pref_names.h"
|
| #include "chrome/grit/chromium_strings.h"
|
| #include "chrome/grit/generated_resources.h"
|
| #include "components/feedback/feedback_data.h"
|
| #include "components/feedback/feedback_util.h"
|
| #include "components/search_engines/template_url_service.h"
|
| +#include "components/version_info/version_info.h"
|
| #include "content/public/browser/browser_thread.h"
|
| #include "extensions/browser/extension_registry.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| @@ -256,9 +257,8 @@ scoped_ptr<base::ListValue> GetReadableFeedbackForSnapshot(
|
| AddPair(list.get(),
|
| l10n_util::GetStringUTF16(IDS_RESET_PROFILE_SETTINGS_USER_AGENT),
|
| GetUserAgent());
|
| - chrome::VersionInfo version_info;
|
| - std::string version = version_info.Version();
|
| - version += chrome::VersionInfo::GetVersionStringModifier();
|
| + std::string version = version_info::GetVersionNumber();
|
| + version += chrome::GetChannelString();
|
| AddPair(list.get(),
|
| l10n_util::GetStringUTF16(IDS_PRODUCT_NAME),
|
| version);
|
|
|