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

chrome/browser/safe_browsing/srt_client_info_win.cc

Index: chrome/browser/safe_browsing/srt_client_info_win.cc
diff --git a/chrome/browser/safe_browsing/srt_client_info_win.cc b/chrome/browser/safe_browsing/srt_client_info_win.cc
new file mode 100644
index 0000000000000000000000000000000000000000..699ecb9db662c76fe29eb3354f9337d57b454c72
--- /dev/null
+++ b/chrome/browser/safe_browsing/srt_client_info_win.cc
@@ -0,0 +1,33 @@
+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/safe_browsing/srt_client_info_win.h"
+
+#include "chrome/common/channel_info.h"
+#include "components/version_info/version_info.h"
+
+namespace safe_browsing {
+
+const char kChromeVersionSwitch[] = "chrome-version";
+const char kChromeChannelSwitch[] = "chrome-channel";
+
+// static

[alito, 2016/08/26 23:18:08]

nit: remove comment?

[ftirelo, 2016/08/29 00:10:36]

Done.

+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:

[grt (UTC plus 2), 2016/08/28 19:44:22]

remove this so that you get a compiler error in case version_info::Channel ever
grows a new value

[ftirelo, 2016/08/29 00:10:36]

If I simply remove this, I get this error:
d:\workspace\chromium-data-from-reporter\src\chrome\browser\safe_browsing\srt_client_info_win.cc(32)
: warning C4715: 'safe_browsing::ChannelAsInt': not all control paths return a
value.

The best solution IMO would be to:
 - have the following command in the default clause:
    NOTREACHED() << "Invalid channel: "
                 << static_cast<int>(chrome::GetChannel());
 - add a unit test to check for all possible values of version_info::Channel.
Unfortunately, it's not possible to run an iterator over all values of an enum,
unless it's designed to allow that (common trick: define special values BEGIN
and END equal to the first and the last element in the sequence).

One alternative to really cover this case is to have NOTREACHED in the default
clause and add a unit test to call this function, so it would crash if the
current build is defined in the new channel. The problem with that approach is
that we will only notice an error when/if such build is tested, not when the new
channel is introduced.

I'll be happy to implement such a unit test if you think it is worth it, or any
other suggestion you may have.

[grt (UTC plus 2), 2016/08/29 06:56:14]

Do this:

  switch (chrome::GetChannel() {
    case foo:
      return 0;
    case bar:
      return 1;
    ... (explicitly listing all items in the enum, but omitting default:)
  }
  NOTREACHED();
  return 0;
}

this preserves the behavior you had before and clearly shows intent (DCHECK if
GetChannel() returns something that you don't cover -- it can technically return
any int value), and has the bonus of the compiler error in case
version_info::Channel is ever expanded. there is no need for an extra unittest
that checks for out-of-bound values.

[ftirelo, 2016/08/29 16:30:11]

Done.

+      return 0;
+  }
+}
+
+}  // namespace safe_browsing