Move win/win32-official to main waterfall

Bug: 1072012
Change-Id: I8165afcd56cc792e89721c398c7e9a6fb4b64832
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2295829Reviewed-by: Garrett Beaty <gbeaty@chromium.org>
Commit-Queue: Stephanie Kim <kimstephanie@google.com>
Cr-Commit-Position: refs/heads/master@{#787889}

infra/config/generated/luci-milo.cfg

@@ -60,6 +60,16 @@ consoles {
     category: "chromium|win|dbg"
     short_name: "64"
   }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win32-official"
+    category: "chromium|win|off"
+    short_name: "32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win-official"
+    category: "chromium|win|off"
+    short_name: "64"
+  }
   builders {
     name: "buildbucket/luci.chromium.ci/win32-archive-rel"
     category: "chromium|win|rel"
@@ -2135,6 +2145,16 @@ consoles {
     category: "chromium|fuchsia"
     short_name: "off"
   }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win32-official"
+    category: "chromium|win|off"
+    short_name: "32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win-official"
+    category: "chromium|win|off"
+    short_name: "64"
+  }
   builders {
     name: "buildbucket/luci.chromium.ci/Win x64 Builder"
     category: "chromium.win|release|builder"
@@ -2564,16 +2584,6 @@ consoles {
     name: "buildbucket/luci.chromium.ci/Win10 Tests x64 1803"
     category: "chromium.fyi|win10|1803"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci/win32-official"
-    category: "chromium.fyi|win|off"
-    short_name: "32"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.ci/win-official"
-    category: "chromium.fyi|win|off"
-    short_name: "64"
-  }
   header {
     oncalls {
       name: "Chromium"
@@ -5367,6 +5377,16 @@ consoles {
     category: "win|dbg"
     short_name: "64"
   }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win32-official"
+    category: "win|off"
+    short_name: "32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win-official"
+    category: "win|off"
+    short_name: "64"
+  }
   builders {
     name: "buildbucket/luci.chromium.ci/win32-archive-rel"
     category: "win|rel"
@@ -8347,16 +8367,6 @@ consoles {
     category: "perfetto"
     short_name: "win"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci/win32-official"
-    category: "win|off"
-    short_name: "32"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.ci/win-official"
-    category: "win|off"
-    short_name: "64"
-  }
   header {
     oncalls {
       name: "Chromium"

infra/config/subprojects/chromium/ci.star

@@ -511,9 +511,7 @@ ci.chromium_builder(
 
 ci.chromium_builder(
     name = 'win-official',
-    # TODO(https://crbug.com/1072012) Use the default console view and add
-    # main_console_view = settings.main_console_name once the build is green
-    console_view = 'chromium.fyi',
+    main_console_view = settings.main_console_name,
     console_view_entry = ci.console_view_entry(
         category = 'win|off',
         short_name = '64',
@@ -526,9 +524,7 @@ ci.chromium_builder(
 
 ci.chromium_builder(
     name = 'win32-official',
-    # TODO(https://crbug.com/1072012) Use the default console view and add
-    # main_console_view = settings.main_console_name once the build is green
-    console_view = 'chromium.fyi',
+    main_console_view = settings.main_console_name,
     console_view_entry = ci.console_view_entry(
         category = 'win|off',
         short_name = '32',