Add field trials and platform to permission report

chrome/browser/safe_browsing/permission_reporter.cc

 // 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/permission_reporter.h"
 #include "chrome/common/safe_browsing/permission_report.pb.h"
+#include "components/variations/active_field_trials.h"
 #include "content/public/browser/permission_type.h"
 #include "net/url_request/report_sender.h"
 
 using content::PermissionType;
 
 namespace safe_browsing {
 
 namespace {
 // URL to upload permission action reports.
 const char kPermissionActionReportingUploadUrl[] =
@@ skipping 79 matching lines @@
 
 // static
 bool PermissionReporter::BuildReport(const GURL& origin,
                                      PermissionType permission,
                                      PermissionAction action,
                                      std::string* output) {
   PermissionReport report;
   report.set_origin(origin.spec());
   report.set_permission(PermissionTypeToPermissionReportPermission(permission));
   report.set_action(PermissionActionToPermissionReportAction(action));
-  // TODO(stefanocs): Collect other data for the report from global variables.
+// Collect platform data.
+#if defined(OS_ANDROID)
+  report.set_platform_type(PermissionReport::ANDROID_PLATFORM);
+#elif defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_CHROMEOS) || \
+    defined(OS_LINUX)
+  report.set_platform_type(PermissionReport::DESKTOP_PLATFORM);
+#else
+  report.set_platform_type(PermissionReport::PLATFORM_TYPE_UNSPECIFIED);

[raymes, 2016/06/20 01:32:11]

Perhaps add a #error here instead of setting UNSPECIFIED? I don't think it
should be compiled on other platforms but could be wrong (in which case it would
be good to know what platforms it gets compiled on).

[stefanocs, 2016/06/21 07:01:01]

Done.

+#endif
+  // Collect field trials data.
+  std::vector<variations::ActiveGroupId> active_groups_ids;
+  variations::GetFieldTrialActiveGroupIds(&active_groups_ids);

[raymes, 2016/06/20 01:32:11]

I think Kendra mentioned we may only want to add field trials that we're
interested in. But adding them all doesn't seem too bad either (and seems safer)
as long as it doesn't make the reports too big.

Kendra, wdyt?

[kcarattini, 2016/06/20 20:58:17]

Hmm, I don't want to bloat the reports with unnecessary information, but I don't
know a way to only add ones we care about (without waiting for the Chrome
release process to change the code). It seems it would be quicker just to add
them all?

+  for (auto active_group_id : active_groups_ids) {
+    PermissionReport::FieldTrial* field_trial = report.add_field_trials();
+    field_trial->set_name_id(active_group_id.name);
+    field_trial->set_group_id(active_group_id.group);
+  }
   return report.SerializeToString(output);
 }
 
 }  // namespace safe_browsing