Merge all Field Trial Testing Configuration Together

chrome/common/variations/BUILD.gn

Index: chrome/common/variations/BUILD.gn
diff --git a/chrome/common/variations/BUILD.gn b/chrome/common/variations/BUILD.gn
index 8a539761949457dc67e25d1608a323041ae92629..b38c17b95f657d2a486a10e91991f411ecb333a5 100644
--- a/chrome/common/variations/BUILD.gn
+++ b/chrome/common/variations/BUILD.gn
@@ -7,24 +7,26 @@ action("fieldtrial_testing_config_action") {
   script = "//tools/variations/fieldtrial_to_struct.py"
 
   if (is_win) {
-    source = "//testing/variations/fieldtrial_testing_config_win.json"
+    platform = "win"
   }
   if (is_mac) {
-    source = "//testing/variations/fieldtrial_testing_config_mac.json"
+    platform = "mac"
   }
   if (is_linux) {
-    source = "//testing/variations/fieldtrial_testing_config_linux.json"
+    platform = "linux"
   }
   if (is_chromeos) {
-    source = "//testing/variations/fieldtrial_testing_config_chromeos.json"
+    platform = "chromeos"
   }
   if (is_android) {
-    source = "//testing/variations/fieldtrial_testing_config_android.json"
+    platform = "android"
   }
   if (is_ios) {
-    source = "//testing/variations/fieldtrial_testing_config_ios.json"
+    platform = "ios"
   }
 
+  source = "//testing/variations/fieldtrial_testing_config.json"
+
   inputs = [
     "//tools/json_to_struct/element_generator.py",
     "//tools/json_to_struct/json_to_struct.py",
@@ -43,6 +45,7 @@ action("fieldtrial_testing_config_action") {
     "--namespace=chrome_variations",
     "--schema=" +
         rebase_path("fieldtrial_testing_config_schema.json", root_build_dir),
+    "--platform=" + platform,

[Nico, 2016/09/20 20:47:47]

Just passing current_os here is probably just as good?

[robliao, 2016/09/20 21:49:11]

Looks like it should do. Done.

Using current_os for now to maintain same behavior. I wonder if target_os might
be more suitable, although it looks like it might be the same thing in the end.

     "--output=$out_name",
   ]
 }