Index: chrome/browser/chrome_browser_main.cc |
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc |
index 0c7098c582528da5ee10c1685c92db4fc61ba0c3..8e81270f8cf451634d56f3e0d4036ab2cb4308b6 100644 |
--- a/chrome/browser/chrome_browser_main.cc |
+++ b/chrome/browser/chrome_browser_main.cc |
@@ -95,11 +95,11 @@ |
#include "chrome/browser/ui/startup/startup_browser_creator.h" |
#include "chrome/browser/ui/uma_browsing_activity_observer.h" |
#include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" |
+#include "chrome/common/channel_info.h" |
#include "chrome/common/chrome_constants.h" |
#include "chrome/common/chrome_paths.h" |
#include "chrome/common/chrome_result_codes.h" |
#include "chrome/common/chrome_switches.h" |
-#include "chrome/common/chrome_version_info.h" |
#include "chrome/common/crash_keys.h" |
#include "chrome/common/env_vars.h" |
#include "chrome/common/logging_chrome.h" |
@@ -125,6 +125,7 @@ |
#include "components/translate/core/browser/translate_download_manager.h" |
#include "components/variations/net/variations_http_header_provider.h" |
#include "components/variations/variations_associated_data.h" |
+#include "components/version_info/version_info.h" |
#include "content/public/browser/browser_thread.h" |
#include "content/public/browser/notification_observer.h" |
#include "content/public/browser/notification_registrar.h" |
@@ -674,8 +675,7 @@ void ChromeBrowserMainParts::SetupMetricsAndFieldTrials() { |
// Now that field trials have been created, initializes metrics recording. |
metrics->InitializeMetricsRecordingState(); |
- const version_info::Channel channel = |
- chrome::VersionInfo::GetChannel(); |
+ const version_info::Channel channel = chrome::GetChannel(); |
// TODO(dalecurtis): Remove these checks and enable for all channels once we |
// track down the root causes of crbug.com/422522 and crbug.com/478932. |
@@ -1013,7 +1013,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { |
#if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_MACOSX) |
// Set the product channel for crash reports. |
base::debug::SetCrashKeyValue(crash_keys::kChannel, |
- chrome::VersionInfo::GetVersionStringModifier()); |
+ chrome::GetChannelString()); |
#endif // defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_MACOSX) |
// Initialize tracking synchronizer system. |