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 "base/memory/ptr_util.h"
 #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 78 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(PermissionTypeForReport(permission));
   report.set_action(PermissionActionForReport(action));
-  // TODO(stefanocs): Collect field trials and platform type from global
-  // variables to the permission report.
+
+  // 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
+#error Unsupported platform.
+#endif
+
+  // Collect field trials data.

[kcarattini, 2016/06/24 03:42:35]

trials -> trial

[stefanocs, 2016/06/24 05:23:04]

Done.

+  std::vector<variations::ActiveGroupId> active_groups_ids;

[kcarattini, 2016/06/24 03:42:35]

active_groups_ids -> active_group_ids

[stefanocs, 2016/06/24 05:23:04]

Done.

+  variations::GetFieldTrialActiveGroupIds(&active_groups_ids);
+  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