Sends switches to the Software Reporter to enable matching data collection.

chrome/browser/safe_browsing/srt_global_error_win.cc

Index: chrome/browser/safe_browsing/srt_global_error_win.cc
diff --git a/chrome/browser/safe_browsing/srt_global_error_win.cc b/chrome/browser/safe_browsing/srt_global_error_win.cc
index d8afcff64b8491b9e90c3a4fc1e6c1c9844a780b..01a03fc746f0bf31db5fa2a1b51c31ad7bc62679 100644
--- a/chrome/browser/safe_browsing/srt_global_error_win.cc
+++ b/chrome/browser/safe_browsing/srt_global_error_win.cc
@@ -18,11 +18,11 @@
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
+#include "chrome/browser/safe_browsing/srt_client_info_win.h"
 #include "chrome/browser/safe_browsing/srt_field_trial_win.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/global_error/global_error_service.h"
-#include "chrome/common/channel_info.h"
 #include "chrome/installer/util/install_util.h"
 #include "components/component_updater/pref_names.h"
 #include "components/prefs/pref_service.h"
@@ -51,32 +51,10 @@ const base::FilePath::CharType kExecutableExtension[] = L"exe";
 
 // A switch to add to the command line when executing the SRT.
 const char kChromePromptSwitch[] = "chrome-prompt";
-const char kChromeVersionSwitch[] = "chrome-version";
 const char kChromeSystemInstallSwitch[] = "chrome-system-install";
-const char kChromeChannelSwitch[] = "chrome-channel";
 const char kEnableCrashReporting[] = "enable-crash-reporting";
 const char kUmaUserSwitch[] = "uma-user";
 
-// Encodes Chrome's channel as an integer to be passed to the SRT on the command
-// line. The SRT binary expects to recieve Chrome's channel encoded as:
-//     0: unknown; 1: canary; 2: dev; 3: beta; 4: stable.
-int ChannelAsInt() {
-  switch (chrome::GetChannel()) {
-    case version_info::Channel::UNKNOWN:
-      return 0;
-    case version_info::Channel::CANARY:
-      return 1;
-    case version_info::Channel::DEV:
-      return 2;
-    case version_info::Channel::BETA:
-      return 3;
-    case version_info::Channel::STABLE:
-      return 4;
-    default:
-      return 0;
-  }
-}
-
 void MaybeExecuteSRTFromBlockingPool(
     const base::FilePath& downloaded_path,
     bool metrics_enabled,